This is an automated email from the ASF dual-hosted git repository.
valentyn pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
from d454934391 Add extra testing around transaction isolation levels and
update documentation CTR. (#2173)
add 7fbc3b9c6d TINKERPOP-2939 Fixed MergeE/MergeV steps to always throw
exception for invalid `onMatch` option. (#2162)
new eeaf6b1415 resolve merge conflicts
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:
CHANGELOG.asciidoc | 3 ++-
.../gremlin/process/traversal/step/map/MergeEdgeStep.java | 5 +++++
.../process/traversal/step/map/MergeVertexStep.java | 8 ++++++--
.../tinkerpop/gremlin/test/features/map/MergeEdge.feature | 15 +++++++++++++++
.../gremlin/test/features/map/MergeVertex.feature | 13 ++++++++++++-
5 files changed, 40 insertions(+), 4 deletions(-)
