[tinkerpop] branch TINKERPOP-2681 updated (e7e127c -> eb65707)

[sp...@apache.org]

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

spmallette pushed a change to branch TINKERPOP-2681
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git.


 discard e7e127c  TINKERPOP-2681 mergeE() and mergeV()
     add eb65707  TINKERPOP-2681 mergeE() and mergeV()

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (e7e127c)
            \
             N -- N -- N   refs/heads/TINKERPOP-2681 (eb65707)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

No new revisions were added by this update.

Summary of changes:
 .../gremlin/process/traversal/step/map/MergeEdgeStep.java    |  1 -
 .../tinkerpop/gremlin/hadoop/structure/HadoopGraph.java      | 12 +++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)