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 2018/11/14 21:03:33 UTC

[tinkerpop] 01/01: Merge pull request #987 from apache/TINKERPOP-1984

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 778f0eda6cb73f8104e7eb7f278d222b07d37cbd
Merge: 879d3b8 4cf426b
Author: stephen mallette <sp...@users.noreply.github.com>
AuthorDate: Wed Nov 14 16:03:27 2018 -0500

    Merge pull request #987 from apache/TINKERPOP-1984
    
    TINKERPOP-1984 Enable GraphSON serializers to no longer conflict

 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(-)