You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@tinkerpop.apache.org by xi...@apache.org on 2023/04/28 20:17:10 UTC

[tinkerpop] branch 3.6-dev updated (a19a088503 -> a771aff5e8)

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

xiazcy pushed a change to branch 3.6-dev
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git


    from a19a088503 Merge branch '3.5-dev' into 3.6-dev
     add 1b37946b57 Fixing a couple mergeV/E issues.
     new a771aff5e8 Merge pull request #2036 from apache/TINKERPOP-2931

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:
 .../process/traversal/step/map/MergeEdgeStep.java  |  2 +-
 .../process/traversal/step/map/MergeStep.java      | 60 ++++++++++++++++++++--
 .../traversal/step/map/MergeVertexStep.java        | 40 ---------------
 3 files changed, 57 insertions(+), 45 deletions(-)

[tinkerpop] 01/01: Merge pull request #2036 from apache/TINKERPOP-2931

Posted by xi...@apache.org.

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

xiazcy pushed a commit to branch 3.6-dev
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit a771aff5e83c5ed6ea0060be009bb07c25305e3e
Merge: a19a088503 1b37946b57
Author: Yang Xia <55...@users.noreply.github.com>
AuthorDate: Fri Apr 28 13:17:02 2023 -0700

    Merge pull request #2036 from apache/TINKERPOP-2931
    
    Added check for illegal hidden keys, & refactored searchVertices to allow subclasses to override search criteria.

 .../process/traversal/step/map/MergeEdgeStep.java  |  2 +-
 .../process/traversal/step/map/MergeStep.java      | 60 ++++++++++++++++++++--
 .../traversal/step/map/MergeVertexStep.java        | 40 ---------------
 3 files changed, 57 insertions(+), 45 deletions(-)