[zookeeper] 01/02: Merge tag 'upstream/3.4.6+dfsg'
Tim Retout
diocles at moszumanska.debian.org
Wed Aug 20 13:10:52 UTC 2014
This is an automated email from the git hooks/post-receive script.
diocles pushed a commit to branch master
in repository zookeeper.
commit 1413d796f64834b45e0aa45c4c14221bef27cfff
Merge: 31a1d2c d8392a5
Author: Tim Retout <diocles at debian.org>
Date: Tue Aug 19 20:55:35 2014 +0100
Merge tag 'upstream/3.4.6+dfsg'
Upstream version 3.4.6+dfsg
CHANGES.txt | 292 +++++++
NOTICE.txt | 2 +-
bin/zkCleanup.sh | 14 +-
bin/zkCli.sh | 8 +-
bin/zkEnv.sh | 17 +-
bin/zkServer.sh | 46 +-
build.xml | 165 +++-
conf/zoo_sample.cfg | 3 +
ivy.xml | 7 +-
...eper_3.4.4.xml => zookeeper_3.4.6-SNAPSHOT.xml} | 7 +-
.../{zookeeper_3.4.5.xml => zookeeper_3.4.6.xml} | 7 +-
...1.2.15.LICENSE.txt => log4j-1.2.16.LICENSE.txt} | 0
src/c/Cli.vcproj | 262 +-----
src/c/config.h.in | 11 +-
src/c/configure.ac | 2 +-
src/c/depcomp | 344 ++++++--
src/c/include/zookeeper_version.h | 2 +-
src/c/install-sh | 534 ++++++++----
src/c/missing | 145 ++--
src/c/src/cli.c | 9 +-
src/c/src/load_gen.c | 4 +
src/c/src/zookeeper.c | 20 +-
src/c/tests/LibCMocks.cc | 11 +
src/c/tests/TestClient.cc | 12 +
src/c/tests/TestMulti.cc | 50 ++
src/c/zookeeper.sln | 70 +-
src/c/zookeeper.vcproj | 902 +++++++--------------
src/contrib/zkfuse/README.txt | 1 +
src/contrib/zkfuse/configure.ac | 6 +-
src/contrib/zkfuse/src/zkfuse.cc | 2 +-
src/contrib/zkperl/ZooKeeper.xs | 6 +-
src/contrib/zkperl/t/50_access.t | 18 +-
src/contrib/zkpython/src/c/zookeeper.c | 66 +-
src/contrib/zkpython/src/python/zk.py | 22 +-
src/contrib/zkpython/src/test/connection_test.py | 8 +-
src/contrib/zkpython/src/test/get_set_test.py | 7 +-
src/contrib/zkpython/src/test/zktestbase.py | 2 +-
.../config/defaultConnectionSettings.cfg | 3 +-
.../inspector/manager/ZooInspectorManagerImpl.java | 38 +-
.../src/documentation/content/xdocs/recipes.xml | 2 +-
.../documentation/content/xdocs/zookeeperAdmin.xml | 29 +
.../content/xdocs/zookeeperProgrammers.xml | 54 +-
src/docs/src/documentation/skinconf.xml | 2 +-
...eper_3.4.5.xml => zookeeper_3.4.6-SNAPSHOT.xml} | 7 +-
.../{zookeeper_3.4.4.xml => zookeeper_3.4.6.xml} | 7 +-
...1.2.15.LICENSE.txt => log4j-1.2.16.LICENSE.txt} | 0
.../main/org/apache/jute/BinaryInputArchive.java | 17 +-
src/java/main/org/apache/zookeeper/ClientCnxn.java | 79 +-
.../org/apache/zookeeper/ClientCnxnSocketNIO.java | 11 +
src/java/main/org/apache/zookeeper/CreateMode.java | 6 +-
src/java/main/org/apache/zookeeper/Op.java | 19 +
src/java/main/org/apache/zookeeper/ZooKeeper.java | 4 +
.../main/org/apache/zookeeper/ZooKeeperMain.java | 7 +-
.../zookeeper/client/StaticHostProvider.java | 25 +-
.../zookeeper/client/ZooKeeperSaslClient.java | 108 ++-
.../main/org/apache/zookeeper/common/PathTrie.java | 9 +
.../org/apache/zookeeper/jmx/MBeanRegistry.java | 4 +-
.../main/org/apache/zookeeper/server/DataTree.java | 53 +-
.../org/apache/zookeeper/server/NIOServerCnxn.java | 35 +-
.../apache/zookeeper/server/NettyServerCnxn.java | 44 +-
.../zookeeper/server/NettyServerCnxnFactory.java | 44 +-
.../zookeeper/server/PrepRequestProcessor.java | 26 +-
.../apache/zookeeper/server/ServerCnxnFactory.java | 6 +-
.../zookeeper/server/SessionTrackerImpl.java | 2 +-
.../apache/zookeeper/server/SnapshotFormatter.java | 6 +-
.../zookeeper/server/SyncRequestProcessor.java | 61 +-
.../server/UnimplementedRequestProcessor.java | 48 ++
.../zookeeper/server/ZooKeeperSaslServer.java | 55 +-
.../apache/zookeeper/server/ZooKeeperServer.java | 45 +-
.../zookeeper/server/ZooKeeperServerMain.java | 11 +-
.../zookeeper/server/persistence/FileTxnLog.java | 47 +-
.../server/persistence/FileTxnSnapLog.java | 72 +-
.../server/quorum/FastLeaderElection.java | 192 +++--
.../org/apache/zookeeper/server/quorum/Leader.java | 209 +++--
.../apache/zookeeper/server/quorum/Learner.java | 73 +-
.../zookeeper/server/quorum/LearnerHandler.java | 101 ++-
.../server/quorum/ObserverZooKeeperServer.java | 38 +-
.../zookeeper/server/quorum/QuorumCnxManager.java | 26 +-
.../apache/zookeeper/server/quorum/QuorumPeer.java | 117 ++-
.../zookeeper/server/quorum/QuorumPeerConfig.java | 14 +
.../zookeeper/server/quorum/QuorumPeerMain.java | 2 +
.../server/quorum/ReadOnlyRequestProcessor.java | 4 +-
.../org/apache/zookeeper/server/quorum/Vote.java | 77 +-
.../server/quorum/flexible/QuorumMaj.java | 6 +
.../org/apache/zookeeper/server/util/OSMXBean.java | 182 +++++
.../org/apache/zookeeper/version/util/VerGen.java | 8 +-
.../test/data/buffersize/create/version-2/log.1 | Bin 0 -> 51216 bytes
.../data/buffersize/create/version-2/snapshot.0 | Bin 0 -> 296 bytes
src/java/test/data/buffersize/set/version-2/log.1 | Bin 0 -> 51216 bytes
.../test/data/buffersize/set/version-2/snapshot.0 | Bin 0 -> 296 bytes
.../test/data/buffersize/snapshot/version-2/log.1 | Bin 0 -> 51216 bytes
.../data/buffersize/snapshot/version-2/snapshot.0 | Bin 0 -> 296 bytes
.../data/buffersize/snapshot/version-2/snapshot.2 | Bin 0 -> 5429 bytes
.../test/data/invalidsnap/version-2/snapshot.273 | Bin 0 -> 56521 bytes
.../org/apache/zookeeper/JUnit4ZKTestRunner.java | 8 +
src/java/test/org/apache/zookeeper/MockPacket.java | 46 ++
.../org/apache/zookeeper/TestableZooKeeper.java | 9 +
src/java/test/org/apache/zookeeper/VerGenTest.java | 5 +-
.../test/org/apache/zookeeper/ZooKeeperTest.java | 23 +
.../test/org/apache/zookeeper/server/CRCTest.java | 1 +
.../org/apache/zookeeper/server/DataTreeTest.java | 179 ++++
...rverMainTest.java => InvalidSnapCountTest.java} | 28 +-
.../zookeeper/server/MockNIOServerCnxn.java} | 36 +-
.../apache/zookeeper/server/NIOServerCnxnTest.java | 71 ++
.../zookeeper/server/NettyServerCnxnTest.java | 103 +++
.../zookeeper/server/PrepRequestProcessorTest.java | 9 +-
.../zookeeper/server/TruncateCorruptionTest.java | 323 --------
.../zookeeper/server/ZooKeeperServerMainTest.java | 23 +-
.../{test => server/quorum}/CnxManagerTest.java | 188 +++--
.../quorum}/FLEBackwardElectionRoundTest.java | 13 +-
.../server/quorum/FLECompatibilityTest.java | 350 ++++++++
.../zookeeper/server/quorum/FLEDontCareTest.java | 263 ++++++
.../quorum}/FLELostMessageTest.java | 7 +-
.../{test => server/quorum}/FLETestUtils.java | 18 +-
.../server/quorum/QuorumPeerMainTest.java | 178 +++-
.../server/quorum/QuorumPeerTestBase.java | 8 +-
.../zookeeper/server/quorum/WatchLeakTest.java | 306 +++++++
.../apache/zookeeper/server/quorum/Zab1_0Test.java | 515 +++++++++++-
.../zookeeper/server/util/PortForwarder.java | 69 +-
.../org/apache/zookeeper/test/ACLCountTest.java | 4 +-
.../test/org/apache/zookeeper/test/ACLTest.java | 5 +-
.../org/apache/zookeeper/test/BufferSizeTest.java | 132 +++
.../test/org/apache/zookeeper/test/ClientBase.java | 132 ++-
.../apache/zookeeper/test/ClientPortBindTest.java | 1 +
.../test/org/apache/zookeeper/test/ClientTest.java | 64 +-
.../org/apache/zookeeper/test/DataTreeTest.java | 83 --
.../test/org/apache/zookeeper/test/FLETest.java | 74 +-
.../org/apache/zookeeper/test/FollowerTest.java | 233 ++++++
.../zookeeper/test/FourLetterWordsQuorumTest.java | 2 +-
.../apache/zookeeper/test/FourLetterWordsTest.java | 2 +-
.../apache/zookeeper/test/InvalidSnapshotTest.java | 12 +
.../test/org/apache/zookeeper/test/JMXEnv.java | 166 +++-
.../apache/zookeeper/test/LENonTerminateTest.java | 3 +-
.../org/apache/zookeeper/test/LoadFromLogTest.java | 119 +--
.../org/apache/zookeeper/test/MaxCnxnsTest.java | 12 +-
.../zookeeper/test/MultiTransactionTest.java | 101 ++-
.../test/org/apache/zookeeper/test/OOMTest.java | 1 +
.../org/apache/zookeeper/test/OSMXBeanTest.java | 70 ++
.../org/apache/zookeeper/test/PurgeTxnTest.java | 1 +
.../test/org/apache/zookeeper/test/QuorumBase.java | 22 +-
.../test/org/apache/zookeeper/test/QuorumTest.java | 172 +---
.../test/org/apache/zookeeper/test/QuorumUtil.java | 22 +-
.../apache/zookeeper/test/ReadOnlyModeTest.java | 51 +-
.../org/apache/zookeeper/test/RecoveryTest.java | 3 +
.../apache/zookeeper/test/RepeatStartupTest.java | 1 +
.../zookeeper/test/RestoreCommittedLogTest.java | 2 +
.../test/SaslAuthFailDesignatedClientTest.java | 11 +-
...thFailTest.java => SaslAuthFailNotifyTest.java} | 17 +-
.../apache/zookeeper/test/SaslAuthFailTest.java | 37 -
.../org/apache/zookeeper/test/SaslClientTest.java | 62 ++
.../org/apache/zookeeper/test/SessionTest.java | 4 +-
.../zookeeper/test/StaticHostProviderTest.java | 60 +-
.../org/apache/zookeeper/test/TruncateTest.java | 13 +-
.../zookeeper/test/WatchEventWhenAutoReset.java | 212 +++++
.../org/apache/zookeeper/test/WatcherTest.java | 9 +
.../zookeeper/test/ZkDatabaseCorruptionTest.java | 61 +-
zookeeper-3.4.5.jar.asc | 17 -
zookeeper-3.4.5.jar.md5 | 1 -
zookeeper-3.4.5.jar.sha1 | 1 -
zookeeper-3.4.6.jar.asc | 17 +
zookeeper-3.4.6.jar.md5 | 1 +
zookeeper-3.4.6.jar.sha1 | 1 +
162 files changed, 7109 insertions(+), 2803 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