This is an automated email from the ASF dual-hosted git repository.
dkuppitz pushed a commit to branch tp33
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 5f05bf164a2a575d11471ebc4e5daf6fa777ee3e
Merge: 59445da 9a6bf66
Author: Daniel Kuppitz <daniel_kupp...@hotmail.com>
AuthorDate: Fri Jun 28 08:32:20 2019 -0700
Merge pull request #1129 from apache/TINKERPOP-1084
TINKERPOP-1084 Branch option tokens should be allowed to be traversals
CHANGELOG.asciidoc | 1 +
docs/src/upgrade/release-3.3.x.asciidoc | 30 +++++
.../traversal/lambda/PredicateTraversal.java | 68 ++++++++++
.../process/traversal/step/branch/BranchStep.java | 139 +++++++++++----------
.../process/traversal/step/branch/ChooseStep.java | 10 +-
.../process/traversal/step/branch/UnionStep.java | 2 +-
gremlin-test/features/branch/Branch.feature | 37 +++++-
.../process/traversal/step/ComplexTest.java | 46 ++++++-
.../process/traversal/step/branch/BranchTest.java | 47 +++++++
.../tinkergraph/structure/TinkerGraphPlayTest.java | 26 +++-
10 files changed, 323 insertions(+), 83 deletions(-)
