You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bookkeeper.apache.org by si...@apache.org on 2018/01/31 19:03:12 UTC
[bookkeeper] 01/01: Merge branch 'master' into
BP-26/distributedlog_merge
This is an automated email from the ASF dual-hosted git repository.
sijie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git
commit a7f3f20024c17f9c99de68952ec1f1d79adedb7a
Merge: d6f4aa0 937de49
Author: Sijie Guo <si...@apache.org>
AuthorDate: Wed Jan 31 11:02:40 2018 -0800
Merge branch 'master' into BP-26/distributedlog_merge
.test-infra/jenkins/common_job_properties.groovy | 2 +-
.../jenkins/job_bookkeeper_precommit_java8.groovy | 2 +-
.../jenkins/job_bookkeeper_precommit_java9.groovy | 2 +-
bookkeeper-server/pom.xml | 38 +++-
.../org/apache/bookkeeper/bookie/BookieShell.java | 9 +-
.../bookkeeper/client/BookKeeperClientStats.java | 5 +
.../bookkeeper/conf/AbstractConfiguration.java | 29 ++-
.../bookkeeper/conf/ClientConfiguration.java | 76 +++++--
.../bookkeeper/conf/ServerConfiguration.java | 29 ++-
.../apache/bookkeeper/proto/BookieNettyServer.java | 1 +
.../org/apache/bookkeeper/proto/BookieServer.java | 26 +++
.../bookkeeper/proto/PerChannelBookieClient.java | 72 ++++++-
.../apache/bookkeeper/tls/TLSContextFactory.java | 221 ++++++++++++++++-----
.../bookie/BookieInitializationTest.java | 101 ++++++++++
.../org/apache/bookkeeper/test/PortManager.java | 23 +--
.../java/org/apache/bookkeeper/tls/TestTLS.java | 144 +++++++++++---
bookkeeper-server/src/test/resources/cacerts | Bin 110225 -> 0 bytes
.../src/test/resources/client-cert.pem | 32 +++
.../src/test/resources/client-key.jks | Bin 0 -> 3941 bytes
.../src/test/resources/client-key.p12 | Bin 0 -> 4189 bytes
.../src/test/resources/client-key.pem | 52 +++++
bookkeeper-server/src/test/resources/client.jks | Bin 1416 -> 0 bytes
.../src/test/resources/generateKeysAndCerts.sh | 76 +++++++
.../src/test/resources/server-cert.pem | 32 +++
.../src/test/resources/server-key.jks | Bin 0 -> 3941 bytes
.../src/test/resources/server-key.p12 | Bin 0 -> 4189 bytes
.../src/test/resources/server-key.pem | 52 +++++
bookkeeper-server/src/test/resources/server.jks | Bin 1393 -> 0 bytes
.../src/test/resources/trustStorePassword.txt | 1 -
.../prometheus/PrometheusMetricsProvider.java | 25 ++-
.../prometheus/TestPrometheusMetricsProvider.java | 23 +++
.../twitter/finagle/FinagleStatsProvider.java | 22 +-
site/docs/4.6.1/api/ledger-api.md | 63 ++++++
site/docs/4.6.1/overview/releaseNotes.md | 17 +-
site/releases.md | 9 +
.../{ => current-server-old-clients}/pom.xml | 28 ++-
.../backwardcompat/TestCompatOldClients.groovy | 174 ++++++++++++++++
.../src/test/resources/arquillian.xml | 28 +++
.../TestCompatHierarchicalLedgerManager.groovy | 61 +++---
.../TestCompatUpgradeWithHostnameBookieId.groovy | 98 +++++----
...mpatUpgradeOldServerInClusterWithCookies.groovy | 67 ++++---
tests/backward-compat/pom.xml | 1 +
.../TestCompatRecoveryNoPassword.groovy | 177 +++++++++--------
.../TestCompatUpgradeDirect.groovy | 113 ++++++-----
.../{ => backwardcompat}/TestCompatUpgrade.groovy | 82 ++++----
.../bookkeeper/tests/BookKeeperClusterUtils.java | 17 ++
46 files changed, 1604 insertions(+), 426 deletions(-)
--
To stop receiving notification emails like this one, please contact
sijie@apache.org.