[zookeeper] 02/05: Merge tag 'upstream/3.4.7'
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Sat Jan 2 22:09:25 UTC 2016
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository zookeeper.
commit 31865a1146c9399747ef5504a3eaa9562595dccf
Merge: 8628e12 10f3866
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Sat Jan 2 21:45:45 2016 +0100
Merge tag 'upstream/3.4.7'
Upstream version 3.4.7
CHANGES.txt | 201 +
LICENSE.txt | 14 +
NOTICE.txt | 3 +-
bin/README.txt | 12 +-
bin/zkCli.cmd | 48 +-
bin/zkEnv.cmd | 81 +-
bin/zkServer.cmd | 49 +-
bin/zkServer.sh | 73 +-
build.xml | 39 +-
...eper_3.4.6-SNAPSHOT.xml => zookeeper_3.4.7.xml} | 388 +-
lib/slf4j-1.6.1.LICENSE.txt | 21 +
LICENSE.txt => src/LICENSE.txt | 14 +
NOTICE.txt => src/NOTICE.txt | 3 +-
src/c/Makefile.am | 28 +-
src/c/c-doc.Doxyfile | 2504 +++++------
src/c/config.h.in | 6 +-
src/c/configure.ac | 12 +-
src/c/depcomp | 455 +-
src/c/include/recordio.h | 2 +-
src/c/include/winconfig.h | 11 +-
src/c/include/zookeeper_version.h | 2 +-
src/c/install-sh | 374 +-
src/c/missing | 414 +-
src/c/src/mt_adaptor.c | 42 +-
src/c/src/recordio.c | 6 +-
src/c/src/st_adaptor.c | 30 +-
src/c/src/zk_adaptor.h | 16 +-
src/c/src/zk_log.c | 5 +-
src/c/src/zookeeper.c | 119 +-
src/c/tests/LibCMocks.cc | 2 +-
src/c/tests/TestOperations.cc | 35 +
src/c/tests/ZKMocks.cc | 6 +-
src/c/tests/wrappers.opt | 1 +
src/contrib/rest/build.xml | 16 +
.../zookeeper/server/jersey/cfg/RestCfg.java | 4 +
src/contrib/zkperl/ZooKeeper.xs | 19 +-
src/contrib/zkpython/build.xml | 2 +-
src/contrib/zkpython/src/c/zookeeper.c | 2 +-
src/contrib/zkpython/src/test/get_set_test.py | 13 +
src/contrib/zooinspector/NOTICE.txt | 2 +-
src/contrib/zooinspector/README.txt | 186 +-
src/contrib/zooinspector/build.xml | 304 +-
src/contrib/zooinspector/ivy.xml | 94 +-
src/contrib/zooinspector/lib/log4j.properties | 16 +-
.../apache/zookeeper/inspector/ZooInspector.java | 132 +-
.../encryption/BasicDataEncryptionManager.java | 100 +-
.../encryption/DataEncryptionManager.java | 78 +-
.../inspector/gui/NodeViewersChangeListener.java | 74 +-
.../inspector/gui/ZooInspectorAboutDialog.java | 160 +-
.../ZooInspectorConnectionPropertiesDialog.java | 642 +--
.../inspector/gui/ZooInspectorIconResources.java | 236 +-
.../gui/ZooInspectorNodeViewersDialog.java | 1210 +++---
.../gui/ZooInspectorNodeViewersPanel.java | 280 +-
.../zookeeper/inspector/gui/ZooInspectorPanel.java | 722 ++--
.../inspector/gui/ZooInspectorTreeViewer.java | 724 ++--
.../org/apache/zookeeper/inspector/gui/about.html | 42 +-
.../inspector/gui/nodeviewer/NodeViewerACL.java | 374 +-
.../inspector/gui/nodeviewer/NodeViewerData.java | 292 +-
.../gui/nodeviewer/NodeViewerMetaData.java | 372 +-
.../gui/nodeviewer/ZooInspectorNodeViewer.java | 276 +-
.../zookeeper/inspector/logger/LoggerFactory.java | 72 +-
.../zookeeper/inspector/manager/NodeListener.java | 74 +-
.../apache/zookeeper/inspector/manager/Pair.java | 240 +-
.../inspector/manager/ZooInspectorManager.java | 278 +-
.../inspector/manager/ZooInspectorManagerImpl.java | 1768 ++++----
.../inspector/manager/ZooInspectorNodeManager.java | 66 +-
.../org/apache/zookeeper/retry/ZooKeeperRetry.java | 576 +--
src/contrib/zooinspector/zooInspector-dev.sh | 34 +-
src/contrib/zooinspector/zooInspector.cmd | 34 +-
.../documentation/content/xdocs/zookeeperAdmin.xml | 7 +
.../content/xdocs/zookeeperProgrammers.xml | 6 +
src/java/lib/jdiff/zookeeper_3.4.6-SNAPSHOT.xml | 4559 --------------------
src/java/lib/jdiff/zookeeper_3.4.6.xml | 4559 --------------------
.../java/lib/jdiff/zookeeper_3.4.7.xml | 388 +-
src/java/lib/slf4j-1.6.1.LICENSE.txt | 21 +
.../main/org/apache/jute/BinaryInputArchive.java | 20 +-
src/java/main/org/apache/jute/Utils.java | 20 +-
.../main/org/apache/zookeeper/AsyncCallback.java | 242 ++
src/java/main/org/apache/zookeeper/ClientCnxn.java | 126 +-
.../main/org/apache/zookeeper/Transaction.java | 5 +
src/java/main/org/apache/zookeeper/Watcher.java | 2 +-
src/java/main/org/apache/zookeeper/ZooKeeper.java | 68 +-
.../main/org/apache/zookeeper/ZooKeeperMain.java | 29 +-
.../zookeeper/client/FourLetterWordMain.java | 27 +-
.../org/apache/zookeeper/jmx/MBeanRegistry.java | 6 +-
.../main/org/apache/zookeeper/server/DataNode.java | 7 +-
.../main/org/apache/zookeeper/server/DataTree.java | 10 +-
.../org/apache/zookeeper/server/ExitCode.java} | 20 +-
.../org/apache/zookeeper/server/NIOServerCnxn.java | 1 +
.../zookeeper/server/NIOServerCnxnFactory.java | 9 +-
.../apache/zookeeper/server/NettyServerCnxn.java | 5 +-
.../zookeeper/server/NettyServerCnxnFactory.java | 10 +-
.../org/apache/zookeeper/server/ObserverBean.java | 4 +
.../zookeeper/server/PrepRequestProcessor.java | 140 +-
.../org/apache/zookeeper/server/PurgeTxnLog.java | 49 +-
.../zookeeper/server/SessionTrackerImpl.java | 8 +-
.../apache/zookeeper/server/SnapshotFormatter.java | 256 +-
.../zookeeper/server/SyncRequestProcessor.java | 12 +-
.../zookeeper/server/ZooKeeperCriticalThread.java | 52 +
.../apache/zookeeper/server/ZooKeeperServer.java | 56 +-
.../zookeeper/server/ZooKeeperServerListener.java} | 71 +-
.../apache/zookeeper/server/ZooKeeperThread.java | 62 +
.../zookeeper/server/persistence/FileTxnLog.java | 5 +
.../server/quorum/AuthFastLeaderElection.java | 7 +-
.../zookeeper/server/quorum/CommitProcessor.java | 9 +-
.../server/quorum/FastLeaderElection.java | 7 +-
.../apache/zookeeper/server/quorum/Follower.java | 2 +-
.../server/quorum/FollowerRequestProcessor.java | 8 +-
.../server/quorum/FollowerZooKeeperServer.java | 3 +-
.../org/apache/zookeeper/server/quorum/Leader.java | 11 +-
.../server/quorum/LeaderZooKeeperServer.java | 8 +-
.../apache/zookeeper/server/quorum/Learner.java | 3 +
.../zookeeper/server/quorum/LearnerHandler.java | 24 +-
.../server/quorum/LearnerSessionTracker.java | 4 +-
.../server/quorum/LearnerZooKeeperServer.java | 5 +-
.../zookeeper/server/quorum/LocalPeerBean.java | 2 +-
.../apache/zookeeper/server/quorum/Observer.java | 2 +-
.../server/quorum/ObserverRequestProcessor.java | 8 +-
.../server/quorum/ObserverZooKeeperServer.java | 9 +-
.../zookeeper/server/quorum/QuorumCnxManager.java | 44 +-
.../apache/zookeeper/server/quorum/QuorumPeer.java | 72 +-
.../zookeeper/server/quorum/QuorumPeerConfig.java | 35 +-
.../server/quorum/ReadOnlyRequestProcessor.java | 15 +-
.../server/quorum/ReadOnlyZooKeeperServer.java | 4 +
.../apache/zookeeper/test/system/BaseSysTest.java | 13 +-
.../apache/zookeeper/test/system/GenerateLoad.java | 10 +-
.../zookeeper/test/system/QuorumPeerInstance.java | 14 +-
.../apache/zookeeper/test/system/SimpleClient.java | 4 +-
src/java/test/config/findbugsExcludeFile.xml | 4 +-
.../org/apache/jute/BinaryInputArchiveTest.java | 43 +
.../org/apache/zookeeper/JUnit4ZKTestRunner.java | 21 +-
.../org/apache/zookeeper/TestableZooKeeper.java | 15 +-
.../test/org/apache/zookeeper/ZooKeeperTest.java | 54 +
.../org/apache/zookeeper/server/DataTreeTest.java | 56 +
.../zookeeper/server/PrepRequestProcessorTest.java | 393 +-
.../org/apache/zookeeper/server/PurgeTxnTest.java | 371 ++
.../zookeeper/server/ZooKeeperServerMainTest.java | 126 +-
.../zookeeper/server/ZooKeeperThreadTest.java | 84 +
.../zookeeper/server/quorum/CnxManagerTest.java | 13 +-
.../quorum/FLEBackwardElectionRoundTest.java | 5 +-
.../server/quorum/FLECompatibilityTest.java | 6 +-
.../zookeeper/server/quorum/FLEDontCareTest.java | 3 +-
.../server/quorum/FLELostMessageTest.java | 5 +-
.../zookeeper/server/quorum/LearnerTest.java | 5 +-
.../server/quorum/QuorumPeerMainTest.java | 51 +
.../apache/zookeeper/server/quorum/Zab1_0Test.java | 29 +-
.../test/org/apache/zookeeper/test/AsyncOps.java | 87 +-
.../org/apache/zookeeper/test/AsyncOpsTest.java | 37 +-
.../test/org/apache/zookeeper/test/ClientTest.java | 6 +
.../zookeeper/test/DisconnectedWatcherTest.java | 81 +
.../org/apache/zookeeper/test/FLENewEpochTest.java | 5 +-
.../apache/zookeeper/test/FLEPredicateTest.java | 209 +-
.../org/apache/zookeeper/test/FLERestartTest.java | 5 +-
.../test/org/apache/zookeeper/test/FLETest.java | 15 +-
.../apache/zookeeper/test/FLEZeroWeightTest.java | 4 +-
.../apache/zookeeper/test/FourLetterWordsTest.java | 65 +-
.../zookeeper/test/HierarchicalQuorumTest.java | 20 +-
.../apache/zookeeper/test/LENonTerminateTest.java | 5 +-
.../test/org/apache/zookeeper/test/LETest.java | 4 +-
.../zookeeper/test/MultiTransactionTest.java | 451 +-
.../org/apache/zookeeper/test/ObserverLETest.java | 152 +-
.../org/apache/zookeeper/test/PurgeTxnTest.java | 88 -
.../test/org/apache/zookeeper/test/QuorumBase.java | 58 +-
.../test/org/apache/zookeeper/test/QuorumUtil.java | 7 +-
.../zookeeper/test/SessionInvalidationTest.java | 210 +-
.../org/apache/zookeeper/test/TruncateTest.java | 36 +-
.../org/apache/zookeeper/test/WatcherTest.java | 3 +-
.../zookeeper/test/ZkDatabaseCorruptionTest.java | 14 +-
src/packages/deb/init.d/zookeeper | 2 +-
src/recipes/build-recipes.xml | 4 +-
zookeeper-3.4.6.jar.asc | 17 -
zookeeper-3.4.6.jar.md5 | 1 -
zookeeper-3.4.6.jar.sha1 | 1 -
zookeeper-3.4.7.jar.asc | 17 +
zookeeper-3.4.7.jar.md5 | 1 +
zookeeper-3.4.7.jar.sha1 | 1 +
176 files changed, 11254 insertions(+), 17351 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