This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
from 7c3a7ecd17 update index.html (#3314)
new 1c8ad966f0 TINKERPOP-3235 Fixed mergeE validation of static onCreate
overrides
new 750f0811d1 Merge branch '3.7-dev' into 3.8-dev
new a892813dcd Merge branch '3.8-dev'
The 3 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 +
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 | 40 +++++-
.../step/map/MergeVertexStepPlaceholder.java | 5 +-
.../Gremlin.Net.IntegrationTest/Gherkin/Gremlin.cs | 10 +-
gremlin-go/driver/cucumber/gremlin.go | 10 +-
.../io/binary/internals/ArraySerializer.js | 4 +-
.../io/binary/internals/EnumSerializer.js | 5 +-
.../structure/io/binary/internals/SetSerializer.js | 6 +-
.../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 +++-
17 files changed, 292 insertions(+), 19 deletions(-)
