Merge branch 'tp32'
Conflicts:
gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthIntegrateTest.java
gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthOldIntegrateTest.java
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/a74fa0a5
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/a74fa0a5
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/a74fa0a5
Branch: refs/heads/master
Commit: a74fa0a58f2a239634e2565b71360e85627e19b0
Parents: 534d314 38289c8
Author: Stephen Mallette <[email protected]>
Authored: Tue May 9 08:11:41 2017 -0400
Committer: Stephen Mallette <[email protected]>
Committed: Tue May 9 08:11:41 2017 -0400
----------------------------------------------------------------------
.../tinkerpop/gremlin/server/GremlinServerAuthIntegrateTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a74fa0a5/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthIntegrateTest.java
----------------------------------------------------------------------
