Merge branch 'TINKERPOP-1538-tp32' into tp32
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/bc4e0905 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/bc4e0905 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/bc4e0905 Branch: refs/heads/TINKERPOP-1502 Commit: bc4e0905c6c9d53d991066650041288c05ffbebc Parents: 02f1664 b803dce Author: Stephen Mallette <sp...@genoprime.com> Authored: Tue Nov 15 09:34:53 2016 -0500 Committer: Stephen Mallette <sp...@genoprime.com> Committed: Tue Nov 15 09:34:53 2016 -0500 ---------------------------------------------------------------------- CHANGELOG.asciidoc | 2 + .../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 +- .../driver/remote/DriverRemoteConnection.java | 6 +- gremlin-python/pom.xml | 7 +- .../driver/test_driver_remote_connection.py | 12 +-- .../driver/gremlin-server-modern-secure-py.yaml | 4 +- .../driver/remote/RemoteGraphProvider.java | 5 +- .../AbstractGremlinServerPerformanceTest.java | 2 +- .../server/GremlinAdditionPerformanceTest.java | 2 +- .../server/GremlinDriverIntegrateTest.java | 98 ++++++++++---------- .../server/GremlinResultSetIntegrateTest.java | 4 +- .../server/GremlinServerAuthIntegrateTest.java | 24 +++-- .../GremlinServerAuthOldIntegrateTest.java | 25 ++--- .../server/GremlinServerHttpIntegrateTest.java | 94 +++++++++---------- .../server/GremlinServerIntegrateTest.java | 74 ++++++++------- .../GremlinServerSessionIntegrateTest.java | 22 ++--- .../server/GremlinTraversalPerformanceTest.java | 2 +- .../gremlin/server/TestClientFactory.java | 60 ++++++++++++ .../remote/gremlin-server-integration.yaml | 2 +- .../server/gremlin-server-integration.yaml | 2 +- .../server/gremlin-server-performance.yaml | 2 +- 25 files changed, 266 insertions(+), 193 deletions(-) ----------------------------------------------------------------------
