Merge branch 'tp31' into tp32
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/7bb77c6c Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/7bb77c6c Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/7bb77c6c Branch: refs/heads/TINKERPOP-1562 Commit: 7bb77c6c2bf2eb3c371c990eb8d6709e63c42da2 Parents: 35364c8 1e80537 Author: Robert Dale <[email protected]> Authored: Sat Nov 19 04:47:22 2016 -0500 Committer: Robert Dale <[email protected]> Committed: Sat Nov 19 04:47:22 2016 -0500 ---------------------------------------------------------------------- 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/7bb77c6c/CHANGELOG.asciidoc ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7bb77c6c/docs/src/dev/developer/development-environment.asciidoc ----------------------------------------------------------------------
