Merge branch 'TINKERPOP-1363'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/a8cec473 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/a8cec473 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/a8cec473 Branch: refs/heads/master Commit: a8cec47340868c3155b1246829205b197ffae1cf Parents: 0933189 dfe0be5 Author: Daniel Kuppitz <[email protected]> Authored: Fri Dec 2 18:36:19 2016 +0100 Committer: Daniel Kuppitz <[email protected]> Committed: Fri Dec 2 18:36:19 2016 +0100 ---------------------------------------------------------------------- CHANGELOG.asciidoc | 1 + docker/Dockerfile | 5 ++- docker/build/Dockerfile.template | 1 - docker/resources/groovy/grapeConfig.xml | 15 ++++++-- docker/scripts/build.sh | 14 +++++-- docs/preprocessor/install-plugins.sh | 6 ++- .../src/reference/gremlin-applications.asciidoc | 40 ++++++++++++++------ 7 files changed, 59 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a8cec473/CHANGELOG.asciidoc ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a8cec473/docs/src/reference/gremlin-applications.asciidoc ----------------------------------------------------------------------
