Zookeeper 2923#403
Closed
ahan-io wants to merge 33 commits into
Closed
Conversation
added 30 commits
February 13, 2017 11:36
Branch 3.4
Zookeeper 2774
Conflicts: src/java/main/org/apache/zookeeper/ZKUtil.java src/java/test/org/apache/zookeeper/test/ReadOnlyModeTest.java
Zookeeper 2691
Branch 3.4
Branch 3.4
Branch 3.4
Branch 3.4
added 3 commits
October 23, 2017 10:36
afine
requested changes
Oct 23, 2017
Contributor
afine
left a comment
afine
left a comment
There was a problem hiding this comment.
The change looks good to me, although it would be nice if you could clean up the commit log associated with the PR.
Contributor
|
You could use git rebase command to squash/fixup the commits to merge them into one. Rebasing is also handy over standard merge when catching up with trunk, because it generates nice, flat history of commits instead of a railway station. ;) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.