tinkerpop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From spmalle...@apache.org
Subject [12/12] tinkerpop git commit: Merge branch 'TINKERPOP-1538-tp32' into TINKERPOP-1538-master
Date Tue, 15 Nov 2016 00:14:10 GMT
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/76b8fbf2
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/76b8fbf2
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/76b8fbf2

Branch: refs/heads/TINKERPOP-1538-master
Commit: 76b8fbf28eabb0d7d4ed0cc258ea370fa3040941
Parents: 9fe678c b803dce
Author: Stephen Mallette <spmva@genoprime.com>
Authored: Mon Nov 14 19:13:17 2016 -0500
Committer: Stephen Mallette <spmva@genoprime.com>
Committed: Mon Nov 14 19:13:17 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/76b8fbf2/CHANGELOG.asciidoc
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/76b8fbf2/gremlin-python/pom.xml
----------------------------------------------------------------------


Mime
View raw message