ZOOKEEPER-1728. Better error message when reconfig invoked in standalone mode (Alexander Shraer via michim)


git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1583492 13f79535-47bb-0310-9956-ffa450edef68
ZOOKEEPER-1725. Zookeeper Dynamic Conf writes out hostnames when IPs are supplied (Alexander Shraer via michim)


git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1583495 13f79535-47bb-0310-9956-ffa450edef68
ZOOKEEPER-1701. When new and old config have the same version, no need to write new config to disk or create new connections (Alexander Shraer via michim)


git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1583509 13f79535-47bb-0310-9956-ffa450edef68
ZOOKEEPER-1730. Make ZooKeeper easier to test - support simulating a session expiration (Jordan Zimmerman via michim)


git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1583513 13f79535-47bb-0310-9956-ffa450edef68
ZOOKEEPER-1906. zkpython: invalid data in GetData for empty node (Nikita Vetoshkin via michim)


git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1583783 13f79535-47bb-0310-9956-ffa450edef68
ZOOKEEPER-1897. ZK Shell/Cli not processing commands (stack via michim)


git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1584438 13f79535-47bb-0310-9956-ffa450edef68
ZOOKEEPER-1830. Support command line shell for removing watches (Rakesh R via michim)


git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1584454 13f79535-47bb-0310-9956-ffa450edef68
ZOOKEEPER-1831. Document remove watches details to the guide (Rakesh R via michim)


git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1584459 13f79535-47bb-0310-9956-ffa450edef68
Set svn:eol-style property to native.


git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1584497 13f79535-47bb-0310-9956-ffa450edef68
ZOOKEEPER-1575. adding .gitattributes to prevent CRLF and LF mismatches for source and text files (Raja Aluri via michim)


git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1584501 13f79535-47bb-0310-9956-ffa450edef68
Revert "ZOOKEEPER-297. centralize version numbering in the source/build (Diego de Oliveira via michim)"


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