[zookeeper] 01/02: Merge branch 'experimental'
Tony Mancill
tmancill at moszumanska.debian.org
Wed Jun 21 18:54:12 UTC 2017
This is an automated email from the git hooks/post-receive script.
tmancill pushed a commit to branch master
in repository zookeeper.
commit 150c902d5f2d781870e7ae190410352e22509abc
Merge: d17305d 7491dcb
Author: tony mancill <tmancill at debian.org>
Date: Wed Jun 21 11:30:54 2017 -0700
Merge branch 'experimental'
This prunes 3.4.9-4 from the changelog, as that branch is a dead-end.
CHANGES.txt | 2577 --------------------
NOTICE.txt | 96 +-
bin/zkCli.cmd | 48 +-
bin/zkEnv.cmd | 98 +-
bin/zkServer.cmd | 48 +-
build.xml | 96 +-
debian/changelog | 12 +-
debian/patches/02-patch-build-system.patch | 10 +-
...-remove-non-reproducible-manifest-entries.patch | 10 +-
debian/patches/08-reproducible-javadoc.patch | 4 +-
debian/patches/09-spell-check.patch | 252 --
debian/patches/10-CVE-2017-5637.patch | 599 -----
debian/patches/series | 2 -
ivy.xml | 38 +-
ivysettings.xml | 9 +-
.../{zookeeper_3.4.9.xml => zookeeper_3.4.10.xml} | 38 +-
src/NOTICE.txt | 96 +-
src/c/NOTICE.txt | 2 +-
src/c/configure.ac | 2 +-
src/c/include/winconfig.h | 6 +-
src/c/include/zookeeper.h | 14 +-
src/c/include/zookeeper_version.h | 2 +-
src/c/src/load_gen.c | 2 +-
src/c/src/recordio.c | 12 +-
src/c/tests/TestDriver.cc | 2 +-
src/c/zookeeper.sln | 50 +-
src/contrib/build-contrib.xml | 2 +-
src/contrib/zkfuse/src/event.h | 2 +-
src/contrib/zkfuse/src/zkadapter.cc | 2 +-
src/contrib/zkpython/src/c/pyzk_docstrings.h | 6 +-
src/contrib/zkpython/src/c/zookeeper.c | 4 +-
src/contrib/zktreeutil/src/ZkAdaptor.cc | 2 +-
src/contrib/zktreeutil/src/ZkAdaptor.h | 2 +-
src/contrib/zktreeutil/src/ZkTreeUtil.cc | 2 +-
.../inspector/manager/ZooInspectorManagerImpl.java | 4 +-
src/contrib/zooinspector/zooInspector.cmd | 34 +-
src/docs/src/documentation/conf/cli.xconf | 2 +-
.../documentation/content/xdocs/zookeeperAdmin.xml | 44 +
.../content/xdocs/zookeeperProgrammers.xml | 2 +-
src/docs/src/documentation/skinconf.xml | 2 +-
.../{zookeeper_3.4.9.xml => zookeeper_3.4.10.xml} | 38 +-
src/java/main/org/apache/zookeeper/Login.java | 7 +-
.../zookeeper/SaslClientCallbackHandler.java | 104 +
src/java/main/org/apache/zookeeper/Version.java | 13 +-
.../main/org/apache/zookeeper/ZooKeeperMain.java | 2 +-
.../zookeeper/client/ZooKeeperSaslClient.java | 161 +-
.../main/org/apache/zookeeper/server/DataNode.java | 4 +-
.../main/org/apache/zookeeper/server/DataTree.java | 48 +-
.../zookeeper/server/DatadirCleanupManager.java | 2 +-
.../org/apache/zookeeper/server/NIOServerCnxn.java | 134 +-
.../apache/zookeeper/server/NettyServerCnxn.java | 60 +-
.../zookeeper/server/PrepRequestProcessor.java | 3 +-
.../org/apache/zookeeper/server/PurgeTxnLog.java | 51 +-
.../org/apache/zookeeper/server/ServerCnxn.java | 94 +-
.../org/apache/zookeeper/server/ServerConfig.java | 7 +-
.../apache/zookeeper/server/SnapshotFormatter.java | 6 +-
.../zookeeper/server/ZooKeeperSaslServer.java | 114 +-
.../apache/zookeeper/server/ZooKeeperServer.java | 18 +-
.../zookeeper/server/ZooKeeperServerMain.java | 2 +-
.../apache/zookeeper/server/ZooKeeperThread.java | 2 +-
.../main/org/apache/zookeeper/server/ZooTrace.java | 12 +-
.../server/auth/SaslServerCallbackHandler.java | 12 +-
.../zookeeper/server/persistence/FileSnap.java | 12 +-
.../server/persistence/FileTxnSnapLog.java | 16 +-
.../server/quorum/FastLeaderElection.java | 2 +
.../apache/zookeeper/server/quorum/Follower.java | 10 +-
.../zookeeper/server/quorum/FollowerBean.java | 7 +-
.../zookeeper/server/quorum/FollowerMXBean.java | 5 +
.../org/apache/zookeeper/server/quorum/Leader.java | 17 +-
.../apache/zookeeper/server/quorum/LeaderBean.java | 4 +
.../zookeeper/server/quorum/LeaderMXBean.java | 5 +
.../apache/zookeeper/server/quorum/Learner.java | 58 +-
.../zookeeper/server/quorum/LearnerHandler.java | 27 +-
.../apache/zookeeper/server/quorum/Observer.java | 8 +-
.../zookeeper/server/quorum/QuorumCnxManager.java | 348 ++-
.../apache/zookeeper/server/quorum/QuorumPeer.java | 215 +-
.../zookeeper/server/quorum/QuorumPeerConfig.java | 48 +-
.../zookeeper/server/quorum/QuorumPeerMain.java | 39 +-
.../NullQuorumAuthLearner.java} | 21 +-
.../NullQuorumAuthServer.java} | 22 +-
.../zookeeper/server/quorum/auth/QuorumAuth.java | 96 +
.../QuorumAuthLearner.java} | 24 +-
.../server/quorum/auth/QuorumAuthServer.java} | 32 +-
.../server/quorum/auth/SaslQuorumAuthLearner.java | 233 ++
.../server/quorum/auth/SaslQuorumAuthServer.java | 182 ++
.../auth/SaslQuorumServerCallbackHandler.java} | 98 +-
.../org/apache/zookeeper/util/SecurityUtils.java | 298 +++
.../org/apache/zookeeper/version/util/VerGen.java | 29 +-
src/java/test/bin/test-github-pr.sh | 616 +++++
src/java/test/checkstyle.xml | 29 +-
.../test/data/kerberos/minikdc-krb5.conf} | 19 +-
src/java/test/data/kerberos/minikdc.ldiff | 52 +
.../org/apache/zookeeper/ServerConfigTest.java | 74 +
src/java/test/org/apache/zookeeper/VerGenTest.java | 2 +-
src/java/test/org/apache/zookeeper/ZKTestCase.java | 4 +
.../test/org/apache/zookeeper/ZooKeeperTest.java | 23 +
.../org/apache/zookeeper/server/DataNodeTest.java | 65 +
.../apache/zookeeper/server/NIOServerCnxnTest.java | 39 +-
.../org/apache/zookeeper/server/PurgeTxnTest.java | 198 +-
.../zookeeper/server/SessionTrackerTest.java | 2 +-
.../zookeeper/server/ZooKeeperServerMainTest.java | 112 +-
.../server/ZooKeeperServerStartupTest.java | 302 +++
.../zookeeper/server/quorum/CnxManagerTest.java | 17 +-
.../quorum/FLEBackwardElectionRoundTest.java | 4 +-
.../server/quorum/FLECompatibilityTest.java | 4 +-
.../zookeeper/server/quorum/FLEDontCareTest.java | 10 +-
.../server/quorum/FLELostMessageTest.java | 2 +-
.../zookeeper/server/quorum/LearnerTest.java | 4 +-
.../server/quorum/QuorumCnxManagerTest.java | 925 +++++++
.../server/quorum/QuorumPeerTestBase.java | 65 +-
.../apache/zookeeper/server/quorum/Zab1_0Test.java | 73 +-
.../quorum/auth/KerberosSecurityTestcase.java | 120 +
.../server/quorum/auth/KerberosTestUtils.java | 76 +
.../zookeeper/server/quorum/auth/MiniKdc.java | 574 +++++
.../zookeeper/server/quorum/auth/MiniKdcTest.java | 184 ++
.../server/quorum/auth/QuorumAuthTestBase.java | 248 ++
.../server/quorum/auth/QuorumAuthUpgradeTest.java | 239 ++
.../server/quorum/auth/QuorumDigestAuthTest.java | 380 +++
.../server/quorum/auth/QuorumKerberosAuthTest.java | 115 +
.../auth/QuorumKerberosHostBasedAuthTest.java | 192 ++
.../test/org/apache/zookeeper/test/ClientBase.java | 28 +
.../apache/zookeeper/test/ClientPortBindTest.java | 15 +-
.../apache/zookeeper/test/FLEPredicateTest.java | 2 +-
.../test/FourLetterWordsWhiteListTest.java | 252 ++
.../zookeeper/test/HierarchicalQuorumTest.java | 40 +-
.../test/org/apache/zookeeper/test/JMXEnv.java | 48 +
.../org/apache/zookeeper/test/WatcherTest.java | 18 +-
src/lastRevision.bat | 45 +-
src/lastRevision.sh | 2 +-
src/pom.template | 41 +
src/zookeeper.jute | 5 +
zookeeper-3.4.10.jar.asc | 17 +
zookeeper-3.4.10.jar.md5 | 1 +
zookeeper-3.4.10.jar.sha1 | 1 +
zookeeper-3.4.9.jar.asc | 17 -
zookeeper-3.4.9.jar.md5 | 1 -
zookeeper-3.4.9.jar.sha1 | 1 -
137 files changed, 7810 insertions(+), 4478 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/zookeeper.git
More information about the pkg-java-commits
mailing list