Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/tinkerpop
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/4b10b791 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/4b10b791 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/4b10b791 Branch: refs/heads/master Commit: 4b10b79157f07c1dfaae5b7fd26dd2fb1176d8bb Parents: c4a94fb 5d67b9f Author: Daniel Kuppitz <daniel_kupp...@hotmail.com> Authored: Sat Nov 19 11:11:27 2016 +0100 Committer: Daniel Kuppitz <daniel_kupp...@hotmail.com> Committed: Sat Nov 19 11:11:27 2016 +0100 ---------------------------------------------------------------------- CHANGELOG.asciidoc | 2 +- docker/build.sh | 2 +- docker/scripts/build.sh | 7 +++++++ .../developer/development-environment.asciidoc | 18 +++++++++++++++++- giraph-gremlin/src/test/resources/giraph-site.xml | 12 ++++++++++++ 5 files changed, 38 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4b10b791/CHANGELOG.asciidoc ----------------------------------------------------------------------
