This is an automated email from the ASF dual-hosted git repository.
Cole-Greer pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
from f72593d058 CTR Remove leftover client-side requestId references
add 06e02f3bd7 Bump github/codeql-action from 4.37.4 to 4.39.0 (#3726)
add e6f5181a93 TINKERPOP-3059: Prevent repeated option() calls to merge
steps (#3714)
add d5bcb01691 CTR Fix GHA following ubuntu-26 release (#3730)
add f3f5378bb6 Merge branch '3.7-dev' into 3.8-dev
new a02c998421 Merge branch '3.8-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:
.github/workflows/build-test.yml | 35 ++--
.github/workflows/codeql.yml | 28 ++-
CHANGELOG.asciidoc | 2 +
docs/src/dev/provider/gremlin-semantics.asciidoc | 4 +
.../process/traversal/step/map/MergeEdgeStep.java | 4 +
.../step/map/MergeEdgeStepPlaceholder.java | 10 +-
.../traversal/step/map/MergeElementStep.java | 4 +
.../step/map/MergeVertexStepPlaceholder.java | 4 +
.../traversal/step/map/MergeEdgeStepTest.java | 58 ++++++
.../traversal/step/map/MergeVertexStepTest.java | 30 +++
gremlin-dotnet/build/generate.groovy | 8 +-
.../Gremlin.Net.IntegrationTest/Gherkin/Gremlin.cs | 16 ++
gremlin-go/build/generate.groovy | 9 +
gremlin-go/driver/cucumber/gremlin.go | 12 +-
.../scripts/groovy/generate.groovy | 9 +-
.../gremlin-javascript/test/cucumber/gremlin.js | 8 +
gremlin-python/build/generate.groovy | 9 +-
.../src/main/python/tests/feature/gremlin.py | 8 +
.../gremlin/language/translator/translations.json | 208 +++++++++++++++++++++
.../gremlin/test/features/map/MergeEdge.feature | 44 +++++
.../gremlin/test/features/map/MergeVertex.feature | 60 ++++++
21 files changed, 539 insertions(+), 31 deletions(-)
