This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git.
from 879d3b8 Merge branch 'tp33'
add 4cf426b TINKERPOP-1984 Enable GraphSON serializers to no longer
conflict
new 778f0ed Merge pull request #987 from apache/TINKERPOP-1984
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
CHANGELOG.asciidoc | 1 +
.../gremlin-language-variants/index.asciidoc | 2 -
docs/src/upgrade/release-3.4.x.asciidoc | 16 ++++++
.../console/jsr223/gremlin-server-integration.yaml | 6 +-
.../ser/GraphSONMessageSerializerGremlinV2d0.java | 4 +-
.../driver/ser/GraphSONMessageSerializerV2d0.java | 4 +-
.../driver/ser/GraphSONMessageSerializerV3d0.java | 2 +-
.../tinkerpop/gremlin/driver/ser/Serializers.java | 2 +-
.../gremlin/server/AbstractChannelizer.java | 2 +-
.../server/GremlinServerHttpIntegrateTest.java | 64 ++++++++++++++++++++--
.../gremlin/server/gremlin-server-integration.yaml | 4 +-
11 files changed, 90 insertions(+), 17 deletions(-)
