Merge branch 'TINKERPOP-1538' into tp31
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/418fb2a2 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/418fb2a2 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/418fb2a2 Branch: refs/heads/TINKERPOP-1529-variant2 Commit: 418fb2a2f358be9fa31afe9c04cdc3e374683506 Parents: 26db14e 569753e Author: Stephen Mallette <sp...@genoprime.com> Authored: Tue Nov 15 09:34:34 2016 -0500 Committer: Stephen Mallette <sp...@genoprime.com> Committed: Tue Nov 15 09:34:34 2016 -0500 ---------------------------------------------------------------------- CHANGELOG.asciidoc | 1 + .../src/main/java/Service.java | 2 +- .../src/test/java/ServiceTest.java | 2 +- .../src/test/resources/gremlin-server.yaml | 2 +- .../plugin/gremlin-server-integration.yaml | 2 +- .../gremlin/console/groovy/plugin/remote.yaml | 2 +- .../AbstractGremlinServerPerformanceTest.java | 2 +- .../server/GremlinAdditionPerformanceTest.java | 2 +- .../server/GremlinDriverIntegrateTest.java | 92 ++++++++++---------- .../server/GremlinResultSetIntegrateTest.java | 2 +- .../server/GremlinServerAuthIntegrateTest.java | 24 ++--- .../GremlinServerAuthOldIntegrateTest.java | 25 +++--- .../server/GremlinServerHttpIntegrateTest.java | 92 ++++++++++---------- .../server/GremlinServerIntegrateTest.java | 66 +++++++------- .../GremlinServerSessionIntegrateTest.java | 17 ++-- .../server/GremlinTraversalPerformanceTest.java | 2 +- .../gremlin/server/TestClientFactory.java | 60 +++++++++++++ .../server/gremlin-server-integration.yaml | 2 +- .../server/gremlin-server-performance.yaml | 2 +- 19 files changed, 234 insertions(+), 165 deletions(-) ----------------------------------------------------------------------
