This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a change to branch 3.7-dev
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
from 5547f4e048 Fixed up licenses for gremlin-javascript
add 1c8ad966f0 TINKERPOP-3235 Fixed mergeE validation of static onCreate
overrides
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 +++
.../process/traversal/step/map/MergeStep.java | 22 +++
.../Gremlin.Net.IntegrationTest/Gherkin/Gremlin.cs | 14 +-
gremlin-go/driver/cucumber/gremlin.go | 14 +-
.../gremlin-javascript/test/cucumber/gremlin.js | 14 +-
.../src/main/python/tests/feature/gremlin.py | 14 +-
.../process/traversal/step/map/MergeEdgeTest.java | 124 +++++++++++++++
.../traversal/step/map/MergeVertexTest.java | 40 +++++
.../gremlin/test/features/map/MergeEdge.feature | 167 +++++++++++++++++++--
.../gremlin/test/features/map/MergeVertex.feature | 40 +++--
12 files changed, 424 insertions(+), 58 deletions(-)
