Github user lvfangmin commented on the issue:
https://github.com/apache/zookeeper/pull/605
@anmolnar the conflict is due to the missing of FuzzySnapshotRelatedTest
class introduced in ZOOKEEPER-3127, which is fixing the data inconsistency due
to multi-op txn.
We need that in 3.5 as well, if you cherry pick that to 3.5 first, then we
won't have conflict for this one.
Manually tested cherry pick ZOOKEEPER-3127 to 3.5 branch, there is a very
minor conflict in QuorumPeerMainTest, it should be trivial to change while
cherry-picking.
---
