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/08/26 13:12:23 UTC

(tinkerpop) 01/01: Merge pull request #2725 from apache/merge-rename

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 c1e07eb316a308da4f2b2ec2787c453d6ecc932f
Merge: 54926bdee0 dafc54e4d9
Author: Stephen Mallette <sp...@users.noreply.github.com>
AuthorDate: Mon Aug 26 09:12:16 2024 -0400

    Merge pull request #2725 from apache/merge-rename
    
    Renamed steps around "merge" for better consistency.

 CHANGELOG.asciidoc                                 |   2 +
 .../traversal/dsl/graph/GraphTraversal.java        |   6 +-
 .../process/traversal/step/map/MergeEdgeStep.java  |   4 +-
 .../map/{MergeStep.java => MergeElementStep.java}  |  15 +-
 .../process/traversal/step/map/MergeStep.java      | 388 ++++-----------------
 .../traversal/step/map/MergeVertexStep.java        |   4 +-
 .../traversal/step/map/TraversalMergeStep.java     | 126 -------
 .../process/traversal/util/BytecodeHelper.java     |   4 +-
 ...versalMergeStepTest.java => MergeStepTest.java} |   2 +-
 9 files changed, 85 insertions(+), 466 deletions(-)