This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a change to branch 3.8-dev
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
from 83c6fb9175 Merge branch '3.7-dev' into 3.8-dev
add 1c8ad966f0 TINKERPOP-3235 Fixed mergeE validation of static onCreate
overrides
add 750f0811d1 Merge branch '3.7-dev' into 3.8-dev
No new revisions were added by this update.
Summary of changes:
CHANGELOG.asciidoc | 1 +
docs/src/dev/provider/gremlin-semantics.asciidoc | 10 +-
docs/src/upgrade/release-3.7.x.asciidoc | 22 ++++
.../map/AbstractMergeElementStepPlaceholder.java | 2 +
.../step/map/MergeEdgeStepPlaceholder.java | 5 +-
.../traversal/step/map/MergeElementStep.java | 39 +++++-
.../step/map/MergeVertexStepPlaceholder.java | 5 +-
.../Gremlin.Net.IntegrationTest/Gherkin/Gremlin.cs | 10 +-
gremlin-go/driver/cucumber/gremlin.go | 10 +-
.../gremlin-javascript/test/cucumber/gremlin.js | 10 +-
.../src/main/python/tests/feature/gremlin.py | 10 +-
.../gremlin/test/features/map/MergeEdge.feature | 137 ++++++++++++++++++++-
.../gremlin/test/features/map/MergeVertex.feature | 12 ++
.../tinkerpop/gremlin/tinkergraph/TinkerWorld.java | 22 +++-
14 files changed, 282 insertions(+), 13 deletions(-)
