[bookkeeper] 07/12: Merge tag 'upstream/4.3.2'

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository bookkeeper.

commit ab2edef665c4cb75ce6b38869e16869e2f32ebe5
Merge: f8e1fef 6e46ad0
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Jan 16 10:17:18 2017 +0100

    Merge tag 'upstream/4.3.2'
    
    Upstream version 4.3.2

 CHANGES.txt                                        |  71 +++++
 NOTICE                                             |   2 +-
 bookkeeper-benchmark/pom.xml                       |   2 +-
 bookkeeper-server/pom.xml                          |   2 +-
 .../org/apache/bookkeeper/bookie/BookieShell.java  | 203 ++++++++++++--
 .../java/org/apache/bookkeeper/bookie/Cookie.java  |  58 +++-
 .../org/apache/bookkeeper/bookie/EntryLogger.java  |  50 ++--
 .../org/apache/bookkeeper/bookie/FileInfo.java     |   6 +-
 .../bookkeeper/bookie/GarbageCollectorThread.java  |  23 +-
 .../java/org/apache/bookkeeper/bookie/Journal.java |   1 +
 .../bookkeeper/bookie/SortedLedgerStorage.java     |  13 +-
 .../org/apache/bookkeeper/client/BKException.java  |   9 +
 .../org/apache/bookkeeper/client/BookKeeper.java   |   9 +
 .../apache/bookkeeper/client/BookKeeperAdmin.java  |   9 +
 .../apache/bookkeeper/client/LedgerCreateOp.java   |  41 ++-
 .../apache/bookkeeper/client/LedgerDeleteOp.java   |   4 +-
 .../org/apache/bookkeeper/client/LedgerHandle.java |  59 +++-
 .../org/apache/bookkeeper/client/LedgerOpenOp.java |   4 +-
 .../client/RoundRobinDistributionSchedule.java     |  34 ++-
 .../apache/bookkeeper/client/UpdateLedgerOp.java   | 250 +++++++++++++++++
 .../bookkeeper/conf/AbstractConfiguration.java     |   2 +-
 .../bookkeeper/conf/ClientConfiguration.java       | 111 ++++++++
 .../bookkeeper/conf/ServerConfiguration.java       |   5 +
 .../bookkeeper/meta/AbstractZkLedgerManager.java   |  29 +-
 .../bookkeeper/meta/CleanupLedgerManager.java      |   7 +-
 .../apache/bookkeeper/meta/FlatLedgerManager.java  |  37 ---
 .../bookkeeper/meta/FlatLedgerManagerFactory.java  |   5 +
 .../bookkeeper/meta/HierarchicalLedgerManager.java |  95 +------
 .../meta/HierarchicalLedgerManagerFactory.java     |   9 +-
 .../apache/bookkeeper/meta/LedgerIdGenerator.java  |  41 +++
 .../org/apache/bookkeeper/meta/LedgerManager.java  |  43 +--
 .../bookkeeper/meta/LedgerManagerFactory.java      |   8 +
 .../bookkeeper/meta/MSLedgerManagerFactory.java    | 130 ++++-----
 .../bookkeeper/meta/ZkLedgerIdGenerator.java       | 120 ++++++++
 .../bookkeeper/proto/PerChannelBookieClient.java   |   5 +
 .../bookkeeper/util/BookKeeperConstants.java       |   7 +
 .../java/org/apache/bookkeeper/util/IOUtils.java   |  42 +++
 .../apache/bookkeeper/util/LocalBookKeeper.java    |  57 +++-
 .../src/main/resources/NOTICE.bin.txt              |   2 +-
 .../bookie/BookieInitializationTest.java           | 124 ++++-----
 .../bookkeeper/bookie/BookieJournalTest.java       | 112 +++-----
 .../apache/bookkeeper/bookie/CompactionTest.java   |  10 +-
 .../org/apache/bookkeeper/bookie/CookieTest.java   |  95 +++----
 .../org/apache/bookkeeper/bookie/EntryLogTest.java |  48 ++--
 .../bookkeeper/bookie/IndexPersistenceMgrTest.java | 125 +++++++++
 .../apache/bookkeeper/bookie/LedgerCacheTest.java  |  36 +--
 .../bookkeeper/bookie/TestLedgerDirsManager.java   |  26 +-
 .../org/apache/bookkeeper/bookie/UpgradeTest.java  |  87 +++---
 .../bookkeeper/client/BookKeeperCloseTest.java     |  58 ++++
 .../apache/bookkeeper/client/LedgerCloseTest.java  |  37 +++
 .../client/RoundRobinDistributionScheduleTest.java |  99 ++++++-
 .../bookkeeper/client/TestLedgerChecker.java       |  35 ++-
 .../bookkeeper/client/TestWatchEnsembleChange.java |  91 +++---
 .../bookkeeper/client/UpdateLedgerCmdTest.java     | 133 +++++++++
 .../bookkeeper/client/UpdateLedgerOpTest.java      | 305 +++++++++++++++++++++
 .../org/apache/bookkeeper/meta/GcLedgersTest.java  |  40 ++-
 .../bookkeeper/meta/LedgerManagerTestCase.java     |  15 +-
 .../bookkeeper/meta/TestZkLedgerIdGenerator.java   | 122 +++++++++
 .../bookkeeper/replication/AuditorBookieTest.java  |   2 -
 .../replication/AuditorPeriodicCheckTest.java      |  14 +-
 .../replication/AuditorRollingRestartTest.java     |   2 +-
 .../bookkeeper/test/BookKeeperClusterTestCase.java |  19 +-
 .../apache/bookkeeper/test/BookieClientTest.java   |   6 +-
 .../apache/bookkeeper/test/BookieZKExpireTest.java |   5 +-
 .../bookkeeper/test/ConcurrentLedgerTest.java      |  15 +-
 .../apache/bookkeeper/test/ReadOnlyBookieTest.java |   5 +-
 .../apache/bookkeeper/test/TestBackwardCompat.java |  58 ++--
 .../org/apache/bookkeeper/test/TestCallbacks.java  |  18 ++
 .../org/apache/bookkeeper/test/ZooKeeperUtil.java  |   5 +-
 .../apache/bookkeeper/util/TestDiskChecker.java    |  44 ++-
 .../codahale-metrics-provider/pom.xml              |   2 +-
 bookkeeper-stats-providers/pom.xml                 |   4 +-
 .../twitter-ostrich-provider/pom.xml               |   2 +-
 .../stats/twitter/ostrich/OstrichProvider.java     |   7 +-
 .../twitter-science-provider/pom.xml               |   2 +-
 bookkeeper-stats/pom.xml                           |   2 +-
 compat-deps/bookkeeper-server-compat-4.0.0/pom.xml |   2 +-
 compat-deps/bookkeeper-server-compat-4.1.0/pom.xml |   2 +-
 compat-deps/bookkeeper-server-compat-4.2.0/pom.xml |   2 +-
 compat-deps/hedwig-server-compat-4.0.0/pom.xml     |   2 +-
 compat-deps/hedwig-server-compat-4.1.0/pom.xml     |   2 +-
 compat-deps/hedwig-server-compat-4.2.0/pom.xml     |   2 +-
 compat-deps/pom.xml                                |   4 +-
 hedwig-client-jms/pom.xml                          |   2 +-
 hedwig-client/pom.xml                              |   2 +-
 hedwig-protocol/pom.xml                            |   2 +-
 hedwig-server/pom.xml                              |   2 +-
 hedwig-server/src/main/resources/NOTICE.bin.txt    |   2 +-
 pom.xml                                            |   2 +-
 89 files changed, 2634 insertions(+), 809 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/bookkeeper.git