src/contrib/zooinspector/README.jtoaster | 29 29 + 0 - 0 !
src/contrib/zooinspector/src/java/com/nitido/utils/toaster/Toaster.java | 525 525 + 0 - 0 !
2 files changed, 554 insertions(+)

---

build.xml | 19 3 + 16 - 0 !
src/contrib/build-contrib.xml | 2 1 + 1 - 0 !
src/contrib/zooinspector/build.xml | 5 2 + 3 - 0 !
3 files changed, 6 insertions(+), 20 deletions(-)

 patches to upstream build system to enable the relevant bits of the
 test suite for execution during build.

bin/zkServer.sh | 11 1 + 10 - 0 !
1 file changed, 1 insertion(+), 10 deletions(-)

 disable detection of cygwin under debian installs
 as this is not compatible with the way the environment is 
 managed through alternatives.
 .
 TODO - review alongside use of alternatives for managing 
 configuration.

src/c/src/mt_adaptor.c | 6 1 + 5 - 0 !
1 file changed, 1 insertion(+), 5 deletions(-)

 fixes a build failure due to unknown opcode 'lock' in mt_adaptor.c
 This patch can be removed after upgrading to Zookeeper 3.5.0 or later

src/c/src/zookeeper.c | 2 1 + 1 - 0 !
src/c/tests/TestClient.cc | 28 27 + 1 - 0 !
2 files changed, 28 insertions(+), 2 deletions(-)

 slow add_auth calls with multi-threaded client

src/contrib/zktreeutil/src/ZkAdaptor.cc | 1 1 + 0 - 0 !
1 file changed, 1 insertion(+)

 fix a build failure with gcc 4.7

build.xml | 15 0 + 15 - 0 !
1 file changed, 15 deletions(-)

 remove the built-at, built-by and built-on entries in the manifest of the jar files to improve the build reproducibility

build.xml | 4 4 + 0 - 0 !
1 file changed, 4 insertions(+)

 remove the timestamp and set the locale when generating the javadoc to make it reproducible

src/c/include/zookeeper.h | 14 7 + 7 - 0 !
src/c/src/load_gen.c | 2 1 + 1 - 0 !
src/contrib/zkpython/src/c/pyzk_docstrings.h | 6 3 + 3 - 0 !
src/contrib/zkpython/src/c/zookeeper.c | 4 2 + 2 - 0 !
src/contrib/zktreeutil/src/ZkAdaptor.cc | 2 1 + 1 - 0 !
src/contrib/zktreeutil/src/ZkAdaptor.h | 2 1 + 1 - 0 !
src/contrib/zktreeutil/src/ZkTreeUtil.cc | 2 1 + 1 - 0 !
src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/manager/ZooInspectorManagerImpl.java | 4 2 + 2 - 0 !
src/docs/src/documentation/conf/cli.xconf | 2 1 + 1 - 0 !
src/docs/src/documentation/content/xdocs/zookeeperProgrammers.xml | 2 1 + 1 - 0 !
src/java/main/org/apache/zookeeper/server/DatadirCleanupManager.java | 2 1 + 1 - 0 !
src/java/main/org/apache/zookeeper/server/ZooKeeperThread.java | 2 1 + 1 - 0 !
src/java/test/org/apache/zookeeper/server/PurgeTxnTest.java | 6 3 + 3 - 0 !
13 files changed, 25 insertions(+), 25 deletions(-)

 correct spelling mistakes in upstream source

src/docs/src/documentation/content/xdocs/zookeeperAdmin.xml | 44 44 + 0 - 0 !
src/java/main/org/apache/zookeeper/server/NIOServerCnxn.java | 33 29 + 4 - 0 !
src/java/main/org/apache/zookeeper/server/NettyServerCnxn.java | 32 28 + 4 - 0 !
src/java/main/org/apache/zookeeper/server/ServerCnxn.java | 94 92 + 2 - 0 !
src/java/test/org/apache/zookeeper/ZKTestCase.java | 4 4 + 0 - 0 !
src/java/test/org/apache/zookeeper/test/FourLetterWordsWhiteListTest.java | 252 252 + 0 - 0 !
6 files changed, 449 insertions(+), 10 deletions(-)

 [patch 1/2] zookeeper-2693: dos attack on wchp/wchc four letter words
 (4lw). Initial commit for branch-3.4.

build.xml | 3 3 + 0 - 0 !
ivy.xml | 28 28 + 0 - 0 !
src/java/main/org/apache/zookeeper/Login.java | 7 4 + 3 - 0 !
src/java/main/org/apache/zookeeper/SaslClientCallbackHandler.java | 104 104 + 0 - 0 !
src/java/main/org/apache/zookeeper/client/ZooKeeperSaslClient.java | 161 5 + 156 - 0 !
src/java/main/org/apache/zookeeper/server/ZooKeeperSaslServer.java | 114 3 + 111 - 0 !
src/java/main/org/apache/zookeeper/server/auth/SaslServerCallbackHandler.java | 10 6 + 4 - 0 !
src/java/main/org/apache/zookeeper/server/quorum/FastLeaderElection.java | 2 2 + 0 - 0 !
src/java/main/org/apache/zookeeper/server/quorum/Follower.java | 5 3 + 2 - 0 !
src/java/main/org/apache/zookeeper/server/quorum/Leader.java | 12 10 + 2 - 0 !
src/java/main/org/apache/zookeeper/server/quorum/Learner.java | 24 14 + 10 - 0 !
src/java/main/org/apache/zookeeper/server/quorum/LearnerHandler.java | 27 22 + 5 - 0 !
src/java/main/org/apache/zookeeper/server/quorum/Observer.java | 8 4 + 4 - 0 !
src/java/main/org/apache/zookeeper/server/quorum/QuorumCnxManager.java | 347 284 + 63 - 0 !
src/java/main/org/apache/zookeeper/server/quorum/QuorumPeer.java | 181 167 + 14 - 0 !
src/java/main/org/apache/zookeeper/server/quorum/QuorumPeerConfig.java | 48 46 + 2 - 0 !
src/java/main/org/apache/zookeeper/server/quorum/QuorumPeerMain.java | 39 25 + 14 - 0 !
src/java/main/org/apache/zookeeper/server/quorum/auth/NullQuorumAuthLearner.java | 33 33 + 0 - 0 !
src/java/main/org/apache/zookeeper/server/quorum/auth/NullQuorumAuthServer.java | 34 34 + 0 - 0 !
src/java/main/org/apache/zookeeper/server/quorum/auth/QuorumAuth.java | 96 96 + 0 - 0 !
src/java/main/org/apache/zookeeper/server/quorum/auth/QuorumAuthLearner.java | 40 40 + 0 - 0 !
src/java/main/org/apache/zookeeper/server/quorum/auth/QuorumAuthServer.java | 41 41 + 0 - 0 !
src/java/main/org/apache/zookeeper/server/quorum/auth/SaslQuorumAuthLearner.java | 230 230 + 0 - 0 !
src/java/main/org/apache/zookeeper/server/quorum/auth/SaslQuorumAuthServer.java | 180 180 + 0 - 0 !
src/java/main/org/apache/zookeeper/server/quorum/auth/SaslQuorumServerCallbackHandler.java | 148 148 + 0 - 0 !
src/java/main/org/apache/zookeeper/util/SecurityUtils.java | 298 298 + 0 - 0 !
src/java/test/data/kerberos/minikdc-krb5.conf | 30 30 + 0 - 0 !
src/java/test/data/kerberos/minikdc.ldiff | 52 52 + 0 - 0 !
src/java/test/org/apache/zookeeper/server/quorum/CnxManagerTest.java | 15 9 + 6 - 0 !
src/java/test/org/apache/zookeeper/server/quorum/FLEBackwardElectionRoundTest.java | 4 2 + 2 - 0 !
src/java/test/org/apache/zookeeper/server/quorum/FLECompatibilityTest.java | 4 2 + 2 - 0 !
src/java/test/org/apache/zookeeper/server/quorum/FLEDontCareTest.java | 10 5 + 5 - 0 !
src/java/test/org/apache/zookeeper/server/quorum/FLELostMessageTest.java | 2 1 + 1 - 0 !
src/java/test/org/apache/zookeeper/server/quorum/LearnerTest.java | 4 2 + 2 - 0 !
src/java/test/org/apache/zookeeper/server/quorum/QuorumCnxManagerTest.java | 925 925 + 0 - 0 !
src/java/test/org/apache/zookeeper/server/quorum/QuorumPeerTestBase.java | 65 58 + 7 - 0 !
src/java/test/org/apache/zookeeper/server/quorum/Zab1_0Test.java | 44 26 + 18 - 0 !
src/java/test/org/apache/zookeeper/server/quorum/auth/KerberosSecurityTestcase.java | 120 120 + 0 - 0 !
src/java/test/org/apache/zookeeper/server/quorum/auth/KerberosTestUtils.java | 76 76 + 0 - 0 !
src/java/test/org/apache/zookeeper/server/quorum/auth/MiniKdc.java | 418 418 + 0 - 0 !
src/java/test/org/apache/zookeeper/server/quorum/auth/MiniKdcTest.java | 184 184 + 0 - 0 !
src/java/test/org/apache/zookeeper/server/quorum/auth/QuorumAuthTestBase.java | 146 146 + 0 - 0 !
src/java/test/org/apache/zookeeper/server/quorum/auth/QuorumAuthUpgradeTest.java | 239 239 + 0 - 0 !
src/java/test/org/apache/zookeeper/server/quorum/auth/QuorumDigestAuthTest.java | 221 221 + 0 - 0 !
src/java/test/org/apache/zookeeper/server/quorum/auth/QuorumKerberosAuthTest.java | 110 110 + 0 - 0 !
src/java/test/org/apache/zookeeper/server/quorum/auth/QuorumKerberosHostBasedAuthTest.java | 184 184 + 0 - 0 !
src/java/test/org/apache/zookeeper/test/FLEPredicateTest.java | 2 1 + 1 - 0 !
src/zookeeper.jute | 5 5 + 0 - 0 !
48 files changed, 4646 insertions(+), 434 deletions(-)

 cve-2018-8012

Bug-Upstream: https://issues.apache.org/jira/browse/ZOOKEEPER-1045
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=899332

src/java/main/org/apache/zookeeper/server/FinalRequestProcessor.java | 33 30 + 3 - 0 !
src/java/test/org/apache/zookeeper/test/FinalRequestProcessorTest.java | 230 230 + 0 - 0 !
2 files changed, 260 insertions(+), 3 deletions(-)

---