[zookeeper] branch master updated (31a1d2c -> d26c5ae)
Tim Retout
diocles at moszumanska.debian.org
Wed Aug 20 13:10:51 UTC 2014
This is an automated email from the git hooks/post-receive script.
diocles pushed a change to branch master
in repository zookeeper.
from 31a1d2c d/control: Bump epoch on default-jdk BD to exclude archictectures which don't have Java 6 or better (Closes: #742405).
adds d8392a5 Imported Upstream version 3.4.6+dfsg
new 1413d79 Merge tag 'upstream/3.4.6+dfsg'
new d26c5ae debian/changelog: New upstream version
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.
Summary of changes:
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 +
debian/changelog | 6 +-
ivy.xml | 7 +-
.../jdiff/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
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 +-
.../java/lib/jdiff/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
.../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
.../create}/version-2/snapshot.0 | Bin
src/java/test/data/buffersize/set/version-2/log.1 | Bin 0 -> 51216 bytes
.../set}/version-2/snapshot.0 | Bin
.../test/data/buffersize/snapshot/version-2/log.1 | Bin 0 -> 51216 bytes
.../snapshot}/version-2/snapshot.0 | Bin
.../data/buffersize/snapshot/version-2/snapshot.2 | Bin 0 -> 5429 bytes
.../version-2/{snapshot.272 => snapshot.273} | Bin 56408 -> 56521 bytes
.../org/apache/zookeeper/JUnit4ZKTestRunner.java | 8 +
.../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} | 34 +-
.../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 +
163 files changed, 7081 insertions(+), 2835 deletions(-)
rename src/java/lib/jdiff/zookeeper_3.4.4.xml => lib/jdiff/zookeeper_3.4.6-SNAPSHOT.xml (99%)
rename lib/jdiff/{zookeeper_3.4.4.xml => zookeeper_3.4.6.xml} (99%)
rename lib/{log4j-1.2.15.LICENSE.txt => log4j-1.2.16.LICENSE.txt} (100%)
rename lib/jdiff/zookeeper_3.4.5.xml => src/java/lib/jdiff/zookeeper_3.4.6-SNAPSHOT.xml (99%)
rename src/java/lib/jdiff/{zookeeper_3.4.5.xml => zookeeper_3.4.6.xml} (99%)
rename src/java/lib/{log4j-1.2.15.LICENSE.txt => log4j-1.2.16.LICENSE.txt} (100%)
create mode 100644 src/java/main/org/apache/zookeeper/server/UnimplementedRequestProcessor.java
create mode 100644 src/java/main/org/apache/zookeeper/server/util/OSMXBean.java
create mode 100644 src/java/test/data/buffersize/create/version-2/log.1
copy src/java/test/data/{invalidsnap => buffersize/create}/version-2/snapshot.0 (100%)
create mode 100644 src/java/test/data/buffersize/set/version-2/log.1
copy src/java/test/data/{invalidsnap => buffersize/set}/version-2/snapshot.0 (100%)
create mode 100644 src/java/test/data/buffersize/snapshot/version-2/log.1
copy src/java/test/data/{invalidsnap => buffersize/snapshot}/version-2/snapshot.0 (100%)
create mode 100644 src/java/test/data/buffersize/snapshot/version-2/snapshot.2
copy src/java/test/data/invalidsnap/version-2/{snapshot.272 => snapshot.273} (99%)
copy src/java/{main/org/apache/zookeeper/server/ByteBufferOutputStream.java => test/org/apache/zookeeper/MockPacket.java} (50%)
create mode 100644 src/java/test/org/apache/zookeeper/server/DataTreeTest.java
copy src/java/test/org/apache/zookeeper/server/{ZooKeeperServerMainTest.java => InvalidSnapCountTest.java} (79%)
copy src/java/{main/org/apache/zookeeper/server/ObserverBean.java => test/org/apache/zookeeper/server/MockNIOServerCnxn.java} (58%)
create mode 100644 src/java/test/org/apache/zookeeper/server/NIOServerCnxnTest.java
create mode 100644 src/java/test/org/apache/zookeeper/server/NettyServerCnxnTest.java
delete mode 100644 src/java/test/org/apache/zookeeper/server/TruncateCorruptionTest.java
rename src/java/test/org/apache/zookeeper/{test => server/quorum}/CnxManagerTest.java (66%)
rename src/java/test/org/apache/zookeeper/{test => server/quorum}/FLEBackwardElectionRoundTest.java (90%)
create mode 100644 src/java/test/org/apache/zookeeper/server/quorum/FLECompatibilityTest.java
create mode 100644 src/java/test/org/apache/zookeeper/server/quorum/FLEDontCareTest.java
rename src/java/test/org/apache/zookeeper/{test => server/quorum}/FLELostMessageTest.java (96%)
rename src/java/test/org/apache/zookeeper/{test => server/quorum}/FLETestUtils.java (85%)
create mode 100644 src/java/test/org/apache/zookeeper/server/quorum/WatchLeakTest.java
create mode 100644 src/java/test/org/apache/zookeeper/test/BufferSizeTest.java
delete mode 100644 src/java/test/org/apache/zookeeper/test/DataTreeTest.java
create mode 100644 src/java/test/org/apache/zookeeper/test/FollowerTest.java
create mode 100644 src/java/test/org/apache/zookeeper/test/OSMXBeanTest.java
copy src/java/test/org/apache/zookeeper/test/{SaslAuthFailTest.java => SaslAuthFailNotifyTest.java} (87%)
create mode 100644 src/java/test/org/apache/zookeeper/test/SaslClientTest.java
create mode 100644 src/java/test/org/apache/zookeeper/test/WatchEventWhenAutoReset.java
delete mode 100644 zookeeper-3.4.5.jar.asc
delete mode 100644 zookeeper-3.4.5.jar.md5
delete mode 100644 zookeeper-3.4.5.jar.sha1
create mode 100644 zookeeper-3.4.6.jar.asc
create mode 100644 zookeeper-3.4.6.jar.md5
create mode 100644 zookeeper-3.4.6.jar.sha1
--
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