Repository: tinkerpop
Updated Branches:
refs/heads/TINKERPOP-1538-master [created] e0420d544
Merge branch 'TINKERPOP-1538-tp32' into TINKERPOP-1538-master
Conflicts:
gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/AbstractGremlinServerPerformanceTest.java
gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinAdditionPerformanceTest.java
gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinTraversalPerformanceTest.java
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/e0420d54
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/e0420d54
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/e0420d54
Branch: refs/heads/TINKERPOP-1538-master
Commit: e0420d54479ecfd983cd36cfb07f4de8720376a4
Parents: ccdb01c 3bc6911
Author: Stephen Mallette <[email protected]>
Authored: Sun Nov 13 19:42:18 2016 -0500
Committer: Stephen Mallette <[email protected]>
Committed: Sun Nov 13 19:42:18 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 +-
.../server/GremlinDriverIntegrateTest.java | 92 +++++++++----------
.../server/GremlinResultSetIntegrateTest.java | 4 +-
.../server/GremlinServerAuthIntegrateTest.java | 24 ++---
.../GremlinServerAuthOldIntegrateTest.java | 25 +++---
.../server/GremlinServerHttpIntegrateTest.java | 94 ++++++++++----------
.../server/GremlinServerIntegrateTest.java | 74 +++++++--------
.../GremlinServerSessionIntegrateTest.java | 22 +++--
.../gremlin/server/TestClientFactory.java | 60 +++++++++++++
.../remote/gremlin-server-integration.yaml | 2 +-
.../server/gremlin-server-integration.yaml | 2 +-
.../server/gremlin-server-performance.yaml | 2 +-
22 files changed, 260 insertions(+), 187 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e0420d54/CHANGELOG.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e0420d54/gremlin-python/pom.xml
----------------------------------------------------------------------
