This is an automated email from the ASF dual-hosted git repository.
xiazcy pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
from cf4cdac477 Merge branch '3.6-dev'
add 1b37946b57 Fixing a couple mergeV/E issues.
add a771aff5e8 Merge pull request #2036 from apache/TINKERPOP-2931
add 2c9e5300d6 Add tests and changelog for TINKERPOP-2931 CTR
new 62dbd66ab6 Merge branch '3.6-dev'
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 +
.../process/traversal/step/map/MergeEdgeStep.java | 2 +-
.../process/traversal/step/map/MergeStep.java | 60 ++++++++++-
.../traversal/step/map/MergeVertexStep.java | 40 --------
.../traversal/step/map/MergeVertexStepTest.java | 56 +++++++++++
.../Gremlin.Net.IntegrationTest/Gherkin/Gremlin.cs | 9 ++
gremlin-go/driver/cucumber/gremlin.go | 9 ++
.../gremlin-javascript/test/cucumber/gremlin.js | 9 ++
gremlin-python/src/main/python/radish/gremlin.py | 9 ++
.../gremlin/test/features/map/MergeVertex.feature | 110 +++++++++++++++++++++
10 files changed, 260 insertions(+), 45 deletions(-)
