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 ab3d4192b4 Merge branch '3.7-dev' into 3.8-dev
add 7341ab79d6 Backported rename of steps related to "merge" from 4.0
No new revisions were added by this update.
Summary of changes:
CHANGELOG.asciidoc | 4 +-
.../traversal/dsl/graph/GraphTraversal.java | 6 +-
.../process/traversal/step/map/MergeEdgeStep.java | 5 +-
.../step/map/MergeEdgeStepPlaceholder.java | 2 +-
.../map/{MergeStep.java => MergeElementStep.java} | 14 +-
.../process/traversal/step/map/MergeStep.java | 449 +++------------------
.../traversal/step/map/MergeVertexStep.java | 4 +-
.../step/map/MergeVertexStepPlaceholder.java | 2 +-
.../traversal/step/map/TraversalMergeStep.java | 126 ------
.../process/traversal/util/BytecodeHelper.java | 4 +-
...versalMergeStepTest.java => MergeStepTest.java} | 2 +-
11 files changed, 83 insertions(+), 535 deletions(-)
copy
gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/{MergeStep.java
=> MergeElementStep.java} (97%)
delete mode 100644
gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/TraversalMergeStep.java
rename
gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/{TraversalMergeStepTest.java
=> MergeStepTest.java} (98%)
