You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2024/02/13 20:34:05 UTC

(tinkerpop) 01/03: Merge branch 'TINKERPOP-3056' into 3.6-dev

This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit d9e34fb4678c29ffa167066de45a9fa7329a319a
Merge: 4e8a8f95fa d7c2a7913b
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Tue Feb 13 15:17:20 2024 -0500

    Merge branch 'TINKERPOP-3056' into 3.6-dev

 CHANGELOG.asciidoc                                 |  1 +
 .../process/traversal/step/map/MergeEdgeStep.java  |  6 ++--
 .../Gremlin.Net.IntegrationTest/Gherkin/Gremlin.cs |  2 ++
 gremlin-go/driver/cucumber/gremlin.go              |  2 ++
 .../gremlin-javascript/test/cucumber/gremlin.js    |  2 ++
 gremlin-python/src/main/python/radish/gremlin.py   |  2 ++
 .../gremlin/test/features/map/MergeEdge.feature    | 42 ++++++++++++++++++++++
 7 files changed, 54 insertions(+), 3 deletions(-)