ZOOKEEPER-1911. REST contrib module does not include all required files when packaged (Sean Mackrory via michim)


git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1589949 13f79535-47bb-0310-9956-ffa450edef68
ZOOKEEPER-1819. DeserializationPerfTest calls method with wrong arguments (Daniel Knightly via michim)


git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1590116 13f79535-47bb-0310-9956-ffa450edef68
ZOOKEEPER-1673. Zookeeper don't support cidr in expression in ACL with ip scheme (Craig Condit via michim)


git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1590157 13f79535-47bb-0310-9956-ffa450edef68
ZOOKEEPER-1843. Oddity in ByteBufferInputStream skip (Bill Havanki via michim)


git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1590298 13f79535-47bb-0310-9956-ffa450edef68
ZOOKEEPER-1910. RemoveWatches wrongly removes the watcher if multiple watches 
  exists on a path (Rakesh R via camille)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1590850 13f79535-47bb-0310-9956-ffa450edef68
ZOOKEEPER-1695. Inconsistent error code and type for new errors introduced by dynamic reconfiguration (Michi Mutsuzaki via rakeshr)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1591175 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
Apply ZOOKEEPER-1891.

https://issues.apache.org/jira/secure/attachment/12634073/ZOOKEEPER-1891.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