Merge branch 'tp33'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/bdec663e Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/bdec663e Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/bdec663e Branch: refs/heads/master Commit: bdec663e91aab0ffc70e82e6c12e8fca7f2fbed0 Parents: d667735 a4970a4 Author: Stephen Mallette <[email protected]> Authored: Thu Sep 6 08:24:31 2018 -0400 Committer: Stephen Mallette <[email protected]> Committed: Thu Sep 6 08:24:31 2018 -0400 ---------------------------------------------------------------------- CHANGELOG.asciidoc | 1 + gremlin-server/conf/log4j-server.properties | 1 + .../java/org/apache/tinkerpop/gremlin/server/GremlinServer.java | 3 ++- 3 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bdec663e/CHANGELOG.asciidoc ----------------------------------------------------------------------
