ZOOKEEPER-1891. StaticHostProviderTest.testUpdateLoadBalancing times out (Michi Mutsuzaki via rakeshr)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1593682 13f79535-47bb-0310-9956-ffa450edef68
ZOOKEEPER-657. Cut down the running time of ZKDatabase corruption (Michi Mutsuzaki via rakeshr)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1594755 13f79535-47bb-0310-9956-ffa450edef68
ZOOKEEPER-1836. addrvec_next() fails to set next parameter if addrvec_hasnext() returns false (Dutch T. Meyer via michim)


git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1595038 13f79535-47bb-0310-9956-ffa450edef68
ZOOKEEPER-1895. update all notice files, copyright, etc... with the new year - 2014


git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1595273 13f79535-47bb-0310-9956-ffa450edef68
ZOOKEEPER-1062. Net-ZooKeeper: Net::ZooKeeper consumes 100% cpu on wait (Botond Hejj via michim)


git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1595374 13f79535-47bb-0310-9956-ffa450edef68
ZOOKEEPER-1864. quorumVerifier is null when creating a QuorumPeerConfig from parsing a Properties object (Michi Mutsuzaki via rakeshr)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1595443 13f79535-47bb-0310-9956-ffa450edef68
ZOOKEEPER-1797. PurgeTxnLog may delete data logs during roll (Rakesh R via michim)


git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1595552 13f79535-47bb-0310-9956-ffa450edef68
Apply ZOOKEEPER-1892.patch.

https://issues.apache.org/jira/secure/attachment/12634331/ZOOKEEPER-1892.patch
Apply ZOOKEEPER-1870.patch.

https://issues.apache.org/jira/secure/attachment/12635000/ZOOKEEPER-1870.patch
Revert "ZOOKEEPER-297. centralize version numbering in the source/build (Diego de Oliveira via michim)"

This reverts commit 42b1a4c2dee45c686ad85156ba6ceb59fc369bf8.

Conflicts:
	CHANGES.txt
update ZOOKEEPER-1366