GitHub user hanm opened a pull request:
https://github.com/apache/zookeeper/pull/144
ZOOKEEPER-2325 for branch-3.4.
There was a merge conflict on file Zab1_0Test.java when cherry-picking
commit 7c51b01e89acb38165553366f7e3b2a46c00aa27 to branch-3.4. This PR resolves
the merge conflict (it is trivial, just two imports conflicts).
@breed @rgs1 @rakeshadr Please take a look and help committing this thanks.
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/hanm/zookeeper ZOOKEEPER-2325
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/zookeeper/pull/144.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #144
----
commit afd34f286c860591f1e26b1c29539b322cef7bcc
Author: Benjamin Reed <br...@fb.com>
Date: 2017-01-07T00:09:54Z
ZOOKEEPER-2325 (Data inconsistency if all snapshots empty or missing) for
branch-3.4.
Resolved merge conflict on Zab1_0Test.java when cherry-picking
7c51b01e89acb38165553366f7e3b2a46c00aa27.
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
