You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@distributedlog.apache.org by si...@apache.org on 2016/09/10 07:34:18 UTC
[3/5] incubator-distributedlog git commit: Merge branch 'master' into
sijie/support_scala_2.10_and_2.11
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/a8aa66cd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/tree/a8aa66cd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/diff/a8aa66cd
Branch: refs/heads/sijie/support_scala_2.10_and_2.11
Commit: a8aa66cd75507accf38ce7ee4cae00cec641b08f
Parents: 7eebe15 dbca823
Author: Sijie Guo <si...@twitter.com>
Authored: Mon Jul 11 23:08:59 2016 -0700
Committer: Sijie Guo <si...@twitter.com>
Committed: Mon Jul 11 23:08:59 2016 -0700
----------------------------------------------------------------------
Dockerfile | 19 ++++
Vagrantfile | 96 ++++++++++++++++++++
distributedlog-core/conf/bookie.conf.template | 2 +
.../conf/zookeeper.conf.template | 3 +
.../distributedlog-messaging/messaging-2.md | 2 +-
docker/Dockerfile | 18 ++++
docs/basics/quickstart.rst | 2 +-
docs/operations/deployment.rst | 5 +-
pom.xml | 2 +-
scripts/snapshot | 1 +
vagrant/base.sh | 56 ++++++++++++
vagrant/bk.sh | 86 ++++++++++++++++++
vagrant/bk_docker_wrapper.sh | 2 +
vagrant/zk.sh | 46 ++++++++++
14 files changed, 335 insertions(+), 5 deletions(-)
----------------------------------------------------------------------