Merge branch 'tp32' into tp33
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/a4970a4c Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/a4970a4c Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/a4970a4c Branch: refs/heads/tp33 Commit: a4970a4c37dd88f006c60c5ba063ec1af8707e29 Parents: 81f2292 c029eef Author: Stephen Mallette <sp...@genoprime.com> Authored: Thu Sep 6 08:24:10 2018 -0400 Committer: Stephen Mallette <sp...@genoprime.com> Committed: Thu Sep 6 08:24:10 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/a4970a4c/CHANGELOG.asciidoc ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a4970a4c/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GremlinServer.java ----------------------------------------------------------------------
