distributedlog-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From si...@apache.org
Subject [20/29] incubator-distributedlog git commit: Merge branch 'merge/DL-91' into merge/DL-92
Date Wed, 21 Dec 2016 08:00:28 GMT
Merge branch 'merge/DL-91' into merge/DL-92


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

Branch: refs/heads/merge/DL-98
Commit: adc8ad198d59a05dc623818c0948f8f219ce0a8b
Parents: f19e756 4fc6f3d
Author: Sijie Guo <sijie@apache.org>
Authored: Fri Dec 16 23:51:41 2016 -0800
Committer: Sijie Guo <sijie@apache.org>
Committed: Fri Dec 16 23:51:41 2016 -0800

----------------------------------------------------------------------
 .gitignore                                      |   4 +
 .travis.yml                                     |   4 +
 Dockerfile                                      |  10 +-
 Vagrantfile                                     |   5 +-
 distributedlog-benchmark/bin/bundle             |   7 +-
 distributedlog-benchmark/bin/dbench             |  15 +-
 distributedlog-benchmark/conf/dlogenv.sh        |   2 +-
 .../routing/ConsistentHashRoutingService.java   |   2 +-
 distributedlog-core/bin/dlog                    |  12 +-
 distributedlog-core/conf/write_proxy.conf       |   2 +-
 .../distributedlog/DistributedLogConstants.java |   2 +-
 distributedlog-service/bin/bundle               |   7 +-
 distributedlog-service/bin/dlog                 |  10 +-
 distributedlog-service/bin/dlog-daemon.sh       | 170 +++++++++----------
 .../distributedlog-kafka/bin/runner             |   1 -
 docker/Dockerfile                               |  35 ----
 docs/admin_guide/vagrant.rst                    |   4 +-
 docs/basics/introduction.rst                    |  14 +-
 docs/deployment/cluster.rst                     |  58 ++++---
 docs/deployment/docker.rst                      |   2 +-
 pom.xml                                         |  11 +-
 scripts/bundle                                  |   2 -
 scripts/common.sh                               |  10 +-
 scripts/integration/smoketest.sh                | 113 ++++++++++++
 scripts/runner                                  |  12 +-
 scripts/snapshot                                |  11 +-
 vagrant/base.sh                                 |  43 ++---
 vagrant/bk.sh                                   |  64 +++----
 vagrant/zk.sh                                   |   5 +-
 29 files changed, 362 insertions(+), 275 deletions(-)
----------------------------------------------------------------------



Mime
View raw message