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 2021/06/17 11:58:43 UTC

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

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 0ab7731b90f005d45e0aa743e0ebc1c34ec22916
Merge: 0971b2b e288984
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Thu Jun 17 07:58:19 2021 -0400

    Merge branch 'TINKERPOP-2507'

 CHANGELOG.asciidoc                                 |   2 +
 docs/src/upgrade/release-3.6.x.asciidoc            |  43 ++++++++
 .../apache/tinkerpop/gremlin/structure/Graph.java  |   4 -
 .../gremlin/structure/util/ElementHelper.java      |  22 +---
 .../util/iterator/AbortiveMultiIterator.java       | 120 +++++++++++++++++++++
 ...torTest.java => AbortiveMultiIteratorTest.java} |  83 +++++++++++---
 .../gremlin/util/iterator/MultiIteratorTest.java   |  11 +-
 .../process/traversal/CoreTraversalTest.java       |   9 +-
 .../tinkerpop/gremlin/structure/GraphTest.java     |  68 ------------
 .../gremlin/hadoop/structure/HadoopGraph.java      |  62 ++++++-----
 .../gremlin/neo4j/structure/Neo4jGraph.java        |   2 -
 .../gremlin/tinkergraph/structure/TinkerGraph.java |  31 ++----
 .../structure/TinkerGraphIdManagerTest.java        |   6 +-
 .../tinkergraph/structure/TinkerGraphTest.java     |  19 ++++
 14 files changed, 305 insertions(+), 177 deletions(-)