Skip to content
This repository was archived by the owner on May 20, 2019. It is now read-only.

Fixed bug #44 - incorrect function name - #54

Merged
pwalsh merged 2 commits into
masterfrom
fix/proxy-failed
Jun 14, 2016
Merged

pwalsh merged 2 commits into
masterfrom
fix/proxy-failed

Conversation

@zhenyab

@zhenyab zhenyab commented Jun 12, 2016

Copy link
Copy Markdown
Contributor

@pwalsh Please, review

Fixed tests
Clean up the code
Comment thread .idea/codeStyleSettings.xml Outdated
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@zhenyab cant have this here.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@pwalsh strange, I have added .idea folder to gitignore, but still see it in commit :)

Removed from GIT repo

@rufuspollock

Copy link
Copy Markdown
Contributor

@zhenyab is there any way to "compress" / rebase so we don't have the addition of the IDE folder then its removal?

@zhenyab

zhenyab commented Jun 13, 2016

Copy link
Copy Markdown
Contributor Author

@rgrp in pull request it is not a problem, because it will squash commits when merged, and history of the master will remain clean. Is this what you mean?

@pwalsh
pwalsh merged commit f916723 into master Jun 14, 2016
@pwalsh
pwalsh deleted the fix/proxy-failed branch June 14, 2016 05:58
@pwalsh

pwalsh commented Jun 14, 2016

Copy link
Copy Markdown

@zhenyab I merged. Next time, try to separate actual fixes for issues from general code cleanup.

@rgrp using squash and merge we do not get the IDE stuff in the master history.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants