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/07/01 11:57:16 UTC
[tinkerpop] 01/02: Merge branch 'TINKERPOP-2250' into tp34
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 7c169e26c81b7b1fe94c23ccb5b5cc8a4dab81fe
Merge: 4471cc5 0870145
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Mon Jul 1 07:55:23 2019 -0400
Merge branch 'TINKERPOP-2250' into tp34
CHANGELOG.asciidoc | 3 ++
.../gremlin-server-integration-secure.yaml | 1 +
.../gremlin-server/gremlin-server-integration.yaml | 1 +
docs/src/reference/gremlin-applications.asciidoc | 15 +++++----
docs/src/reference/gremlin-variants.asciidoc | 6 +++-
.../gremlin-language-variants/index.asciidoc | 6 +++-
docs/src/upgrade/release-3.4.x.asciidoc | 10 ++++++
gremlin-console/conf/remote-objects.yaml | 9 ++---
gremlin-console/conf/remote-secure.yaml | 2 +-
gremlin-console/conf/remote.yaml | 4 ++-
.../console/jsr223/DriverGremlinPlugin.java | 2 ++
.../console/jsr223/gremlin-server-integration.yaml | 2 +-
.../tinkerpop/gremlin/console/jsr223/remote.yaml | 2 +-
.../handler/WebSocketGremlinRequestEncoder.java | 3 --
.../ser/AbstractGryoMessageSerializerV1d0.java | 2 ++
.../ser/AbstractGryoMessageSerializerV3d0.java | 2 ++
.../driver/ser/GraphBinaryMessageSerializerV1.java | 39 +++++++++++++++++++---
.../driver/ser/GryoMessageSerializerV1d0.java | 2 ++
.../driver/ser/GryoMessageSerializerV3d0.java | 2 ++
.../binary/GraphBinaryMessageSerializerV1Test.java | 17 ++++++++++
gremlin-server/conf/gremlin-server-classic.yaml | 1 +
gremlin-server/conf/gremlin-server-modern-py.yaml | 9 ++---
.../conf/gremlin-server-modern-readonly.yaml | 9 ++---
gremlin-server/conf/gremlin-server-modern.yaml | 9 ++---
gremlin-server/conf/gremlin-server-neo4j.yaml | 1 +
gremlin-server/conf/gremlin-server-secure.yaml | 1 +
gremlin-server/conf/gremlin-server-spark.yaml | 1 +
gremlin-server/conf/gremlin-server.yaml | 9 ++---
.../gremlin/server/AbstractChannelizer.java | 10 +++---
.../server/GremlinServerAuthKrb5IntegrateTest.java | 26 ++++++++-------
.../gremlin/server/gremlin-server-integration.yaml | 1 +
31 files changed, 152 insertions(+), 55 deletions(-)