[tinkerpop] branch TINKERPOP-2681 updated (dcf707e -> e9513ca)

[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 dcf707e  more tests
 discard c758fe5  More tests and argument validation
 discard f19c3bc  allow id for in/out and other code review items
 discard b1dc488  updated comment on test and created jira
 discard 55966af  fix logger message
 discard c54da34  minor doc fixes
 discard 1eca73d  improved upgrade docs
 discard eb65707  TINKERPOP-2681 mergeE() and mergeV()
     add 2ef450c  TINKERPOP-2681 mergeE() and mergeV()
     add 2d1b989  address feedback from first round of code review
     add e9513ca  Added from/to aliases for Direction OUT/IN

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   (dcf707e)
            \
             N -- N -- N   refs/heads/TINKERPOP-2681 (e9513ca)

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:
 CHANGELOG.asciidoc                                 |  1 +
 docs/src/reference/gremlin-variants.asciidoc       |  9 ++++++
 .../tinkerpop/gremlin/jsr223/CoreImports.java      | 12 ++++++++
 .../language/grammar/GenericLiteralVisitor.java    |  2 +-
 .../language/grammar/TraversalEnumParser.java      | 11 +++++++
 .../process/traversal/step/map/MergeEdgeStep.java  |  5 ++--
 .../traversal/step/map/MergeVertexStep.java        |  4 +--
 .../tinkerpop/gremlin/structure/Direction.java     | 34 ++++++++++++++++++++++
 .../tinkerpop/gremlin/structure/DirectionTest.java |  8 +++++
 .../src/Gremlin.Net/Process/Traversal/Direction.cs |  6 ++++
 .../Gherkin/GherkinTestRunner.cs                   |  3 ++
 .../Gremlin.Net.IntegrationTest/Gherkin/Gremlin.cs |  6 ++++
 gremlin-javascript/build/generate.groovy           |  4 ++-
 .../test/cucumber/feature-steps.js                 | 12 ++++++--
 .../gremlin-javascript/test/cucumber/gremlin.js    | 10 ++++++-
 gremlin-language/src/main/antlr4/Gremlin.g4        |  4 +--
 .../python/gremlin_python/process/traversal.py     |  2 ++
 .../src/main/python/radish/feature_steps.py        | 13 ++++++++-
 gremlin-python/src/main/python/radish/gremlin.py   |  6 ++++
 gremlin-test/features/map/MergeEdge.feature        | 20 ++++++++++++-
 20 files changed, 159 insertions(+), 13 deletions(-)