[tinkerpop] 05/05: Merge branch '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 e57d2b4f20ece628b12a4ef44e3a774d1845580a Merge: 9925aaf d703095 Author: Stephen Mallette AuthorDate: Mon Jun 3 13:20:53 2019 -0400 Merge branch 'tp34' CHANGELOG.asciidoc | 9 + docs/src/upgrade/release-3.3.x.asciidoc | 7 +++ docs/src/upgrade/release-3.4.x.asciidoc | 9 - 3 files changed, 24 insertions(+), 1 deletion(-)
[tinkerpop] 05/05: Merge branch 'tp34'
This is an automated email from the ASF dual-hosted git repository. rdale pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tinkerpop.git commit 16700b2034f9b125ad46625cbee5baca18666db8 Merge: 565a073 50b64e0 Author: Robert Dale AuthorDate: Fri Jul 12 09:56:17 2019 -0400 Merge branch 'tp34' docs/src/dev/future/index.asciidoc | 2 +- docs/src/recipes/collections.asciidoc | 2 +- docs/src/reference/gremlin-variants.asciidoc | 14 +++--- .../src/tutorials/gremlin-language-variants/index.asciidoc | 2 +- docs/src/tutorials/gremlins-anatomy/index.asciidoc | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-)
[tinkerpop] 05/05: Merge branch '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 0af88d5aa630321196ea60c2b8ebdb8313eaf6ae Merge: 86ac0c8 c3fa4b5 Author: Stephen Mallette AuthorDate: Tue Jul 30 09:30:18 2019 -0400 Merge branch '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(-)