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 2019/09/26 14:11:42 UTC

[tinkerpop] 01/01: Merge branch 'TINKERPOP-2295'

This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 483dd904f9774dc8fdcfb3d7110cfb96b2cc3e0c
Merge: 4d2142d ef94c85
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Thu Sep 26 09:35:21 2019 -0400

    Merge branch 'TINKERPOP-2295'

 .../gremlin-server-integration-secure.yaml         |  2 +-
 .../gremlin-server/gremlin-server-integration.yaml |  2 +-
 docs/src/reference/gremlin-variants.asciidoc       |  2 +-
 docs/src/upgrade/release-3.5.x.asciidoc            |  2 +
 .../apache/tinkerpop/gremlin/driver/Client.java    |  4 +-
 .../tinkerpop/gremlin/driver/RequestOptions.java   |  2 +-
 .../apache/tinkerpop/gremlin/driver/Tokens.java    |  6 ---
 .../driver/remote/DriverRemoteConnection.java      |  3 --
 .../driver/remote/DriverRemoteConnectionTest.java  |  2 +-
 .../gremlin/groovy/engine/GremlinExecutor.java     | 35 --------------
 .../gremlin/groovy/engine/GremlinExecutorTest.java | 12 ++---
 .../apache/tinkerpop/gremlin/server/Settings.java  | 12 +----
 .../gremlin/server/op/AbstractEvalOpProcessor.java |  7 +--
 .../server/op/traversal/TraversalOpProcessor.java  |  7 +--
 .../gremlin/server/GremlinDriverIntegrateTest.java | 20 --------
 .../gremlin/server/GremlinServerIntegrateTest.java | 53 ++--------------------
 16 files changed, 23 insertions(+), 148 deletions(-)