Merge remote-tracking branch 'origin/tp31'
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/406956db Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/406956db Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/406956db Branch: refs/heads/TINKERPOP-1278 Commit: 406956db52125dee2fa4f3622fe967f09b1e2413 Parents: 55eb1e6 f7e7df0 Author: Stephen Mallette <sp...@genoprime.com> Authored: Mon Jun 6 16:18:21 2016 -0400 Committer: Stephen Mallette <sp...@genoprime.com> Committed: Mon Jun 6 16:18:21 2016 -0400 ---------------------------------------------------------------------- .../java/org/apache/tinkerpop/gremlin/server/GremlinServer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------