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/30 13:30:33 UTC

[tinkerpop] 04/05: Merge branch 'tp33' 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 c3fa4b575db708e490ea961663ef93913083a823
Merge: 3cc72e1 2c14c66
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Tue Jul 30 09:30:09 2019 -0400

    Merge branch 'tp33' into tp34

 CHANGELOG.asciidoc                                 |  2 ++
 docs/src/dev/io/graphson.asciidoc                  |  4 +++
 docs/src/reference/implementations-neo4j.asciidoc  | 37 ----------------------
 docs/src/upgrade/release-3.3.x.asciidoc            |  9 ++++++
 .../gremlin_python/structure/io/graphsonV2d0.py    | 21 ++++++------
 .../gremlin_python/structure/io/graphsonV3d0.py    | 20 +++++-------
 .../jython/tests/structure/io/test_graphsonV2d0.py | 19 +++++++----
 .../jython/tests/structure/io/test_graphsonV3d0.py | 13 ++++----
 .../gremlin/neo4j/structure/Neo4jGraph.java        | 17 +++++++++-
 .../neo4j/structure/trait/MultiMetaNeo4jTrait.java |  2 ++
 .../gremlin/neo4j/structure/trait/Neo4jTrait.java  |  2 ++
 .../structure/trait/NoMultiNoMetaNeo4jTrait.java   |  2 ++
 .../tinkergraph/structure/TinkerGraphIterator.java |  3 +-
 13 files changed, 74 insertions(+), 77 deletions(-)