You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2016/11/15 14:35:29 UTC
[7/7] tinkerpop git commit: Merge branch 'TINKERPOP-1538-master'
Merge branch 'TINKERPOP-1538-master'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/ae11314c
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ae11314c
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/ae11314c
Branch: refs/heads/master
Commit: ae11314c87dca8850756913e8122c52bcf941779
Parents: 4166e7c 76b8fbf
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Nov 15 09:35:07 2016 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Nov 15 09:35:07 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 | 98 ++++++++++----------
.../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, 263 insertions(+), 190 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ae11314c/CHANGELOG.asciidoc
----------------------------------------------------------------------