distributedlog-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From si...@apache.org
Subject [5/5] incubator-distributedlog git commit: Merge branch 'master' into sijie/support_scala_2.10_and_2.11
Date Sat, 10 Sep 2016 07:34:20 GMT
Merge branch 'master' into sijie/support_scala_2.10_and_2.11


Project: http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/commit/08cd8642
Tree: http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/tree/08cd8642
Diff: http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/diff/08cd8642

Branch: refs/heads/sijie/support_scala_2.10_and_2.11
Commit: 08cd8642c57ced2373c488f7aad8858ae34e0684
Parents: 8ac6fbe 05a8daa
Author: Sijie Guo <sijieg@twitter.com>
Authored: Sat Sep 10 00:31:04 2016 -0700
Committer: Sijie Guo <sijieg@twitter.com>
Committed: Sat Sep 10 00:31:04 2016 -0700

----------------------------------------------------------------------
 .travis.yml                                     |  37 +-
 Dockerfile                                      |  17 +
 NOTICE                                          |  12 +
 README.md                                       |   2 +-
 Vagrantfile                                     |  15 +
 distributedlog-benchmark/bin/bundle             |  18 +
 distributedlog-benchmark/bin/dbench             |   2 -
 distributedlog-benchmark/conf/benchmark.conf    |  18 +
 distributedlog-benchmark/conf/dlogenv.sh        |   3 -
 distributedlog-benchmark/conf/log4j.properties  |  18 +
 distributedlog-benchmark/pom.xml                |  14 +-
 distributedlog-benchmark/src/assemble/bin.xml   |  55 --
 .../distributedlog/benchmark/Benchmarker.java   |  11 +-
 .../distributedlog/benchmark/ReaderWorker.java  |   5 +-
 .../distributedlog/benchmark/WriterWorker.java  |   9 +-
 .../src/main/thrift/loadtest.thrift             |  18 +
 distributedlog-client/pom.xml                   |   4 +-
 .../service/DistributedLogClientBuilder.java    |  28 +
 .../src/test/resources/log4j.properties         |  24 +-
 distributedlog-core/bin/dlog                    |  18 +
 distributedlog-core/conf/bookie.conf.template   |   2 -
 distributedlog-core/conf/distributedlog.conf    |  22 +-
 distributedlog-core/conf/log4j.properties       |  20 +
 distributedlog-core/conf/write_proxy.conf       |  20 +
 .../conf/zookeeper.conf.dynamic.template        |   2 +-
 distributedlog-core/pom.xml                     |   4 +-
 distributedlog-core/src/assemble/bin.xml        |  55 --
 .../distributedlog/BKDistributedLogManager.java |  27 +-
 .../distributedlog/BKLogReadHandler.java        |   9 +-
 .../distributedlog/BKLogWriteHandler.java       |   4 +-
 .../DistributedLogConfiguration.java            |  35 ++
 .../distributedlog/LocalDLMEmulator.java        |  34 +-
 .../twitter/distributedlog/impl/BKDLUtils.java  |   2 +
 .../distributedlog/lock/DistributedLock.java    | 497 +---------------
 .../distributedlog/lock/NopDistributedLock.java |  51 ++
 .../distributedlog/lock/SessionLock.java        |   2 +-
 .../distributedlog/lock/ZKDistributedLock.java  | 537 +++++++++++++++++
 .../src/main/resources/config/decider.conf      |  17 +
 .../src/main/resources/config/decider.yml       |  19 +
 .../src/main/thrift/metadata.thrift             |  17 +
 .../com/twitter/distributedlog/DLMTestUtil.java |   1 +
 .../distributedlog/TestAsyncReaderWriter.java   |  15 +-
 .../TestBKDistributedLogManager.java            |  24 +
 .../distributedlog/TestBKLogSegmentWriter.java  |  56 +-
 .../distributedlog/TestDistributedLogBase.java  |  12 +-
 .../TestDistributedLogConfiguration.java        |  26 +
 .../distributedlog/TestNonBlockingReads.java    |  45 +-
 .../distributedlog/TestZooKeeperClient.java     |  12 +
 .../admin/TestDistributedLogAdmin.java          |   8 +-
 .../distributedlog/bk/TestLedgerAllocator.java  |  12 +
 .../config/TestConfigurationSubscription.java   |  16 +-
 ...TestDynamicConfigurationFeatureProvider.java |  23 +
 .../lock/TestDistributedLock.java               |  86 +--
 .../src/test/resources/bk_server.conf           |  20 +
 .../src/test/resources/log4j.properties         |  24 +-
 distributedlog-example/bin/bk-cluster           |  18 +
 distributedlog-example/bin/proxy-cluster        |  18 +
 distributedlog-example/bin/proxy-writer         |  18 +
 distributedlog-example/conf/bk_server.conf      |  18 +
 distributedlog-example/conf/distributedlog.conf |  20 +-
 distributedlog-example/conf/log4j.properties    |  18 +
 .../conf/stream_config/example-stream_0.conf    |  18 +
 distributedlog-example/pom.xml                  |  13 +-
 distributedlog-protocol/pom.xml                 |   4 +-
 .../src/main/thrift/service.thrift              |  17 +
 distributedlog-service/bin/bundle               |  18 +
 distributedlog-service/pom.xml                  |   6 +-
 distributedlog-service/src/assemble/bin.xml     |  55 --
 .../service/DistributedLogCluster.java          |   9 +-
 .../HealthCheckServletContextListener.java      |  17 +
 .../stats/MetricsServletContextListener.java    |  17 +
 .../main/resources/config/server_decider.conf   |  20 +
 .../main/resources/config/server_decider.yml    |  20 +
 .../service/TestDistributedLogServer.java       |   7 +
 .../service/TestDistributedLogService.java      |  10 +-
 .../src/test/resources/log4j.properties         |  24 +-
 .../conf/distributedlog.conf                    |  22 +-
 .../distributedlog-basic/conf/log4j.properties  |  20 +
 .../distributedlog-basic/pom.xml                |  13 +-
 .../conf/distributedlog.conf                    |  22 +-
 .../distributedlog-kafka/conf/log4j.properties  |  20 +
 .../distributedlog-kafka/pom.xml                |  13 +-
 .../distributedlog-mapreduce/pom.xml            |   4 +-
 .../conf/distributedlog.conf                    |  22 +-
 .../conf/log4j.properties                       |  20 +
 .../distributedlog-messaging/pom.xml            |  13 +-
 .../src/main/thrift/messaging.thrift            |  19 +
 distributedlog-tutorials/pom.xml                |   4 +-
 docker/Dockerfile                               |  17 +
 docs/basics/quickstart.rst                      |   5 +
 docs/operations/deployment.rst                  |   4 +-
 docs/operations/docker.rst                      |  36 ++
 docs/operations/vagrant.rst                     |  18 +
 pom.xml                                         |  92 ++-
 scripts/dev/dl-merge-pr.py                      | 578 +++++++++++++++++++
 scripts/snapshot                                |  22 +-
 src/assemble/bin.xml                            |  74 +++
 src/assemble/src.xml                            |  63 ++
 src/main/resources/LICENSE.bin.txt              | 302 ++++++++++
 src/main/resources/NOTICE.bin.txt               |  30 +
 vagrant/bk_docker_wrapper.sh                    |  15 +
 101 files changed, 2998 insertions(+), 899 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/blob/08cd8642/distributedlog-core/pom.xml
----------------------------------------------------------------------


Mime
View raw message