Merge branch 'TINKERPOP-1731' into tp32
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/18d5d79b Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/18d5d79b Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/18d5d79b Branch: refs/heads/master Commit: 18d5d79ba2ec6141d69e8406aa7c61d92f69c765 Parents: 98ed3d4 43255ce Author: Stephen Mallette <sp...@genoprime.com> Authored: Fri Sep 22 12:58:08 2017 -0400 Committer: Stephen Mallette <sp...@genoprime.com> Committed: Fri Sep 22 12:58:08 2017 -0400 ---------------------------------------------------------------------- docker/Dockerfile | 5 ++++- docker/build/Dockerfile.template | 1 - docker/scripts/build.sh | 6 +++--- 3 files changed, 7 insertions(+), 5 deletions(-) ----------------------------------------------------------------------
