This is an automated email from the ASF dual-hosted git repository. dkuppitz pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/tinkerpop.git.
from 3cc807b Merge branch 'tp34' add 9a6bf66 TINKERPOP-1084 Allow predicates and traversals to be used as options in `BranchStep`. add 5f05bf1 Merge pull request #1129 from apache/TINKERPOP-1084 new 4471cc5 Merge branch 'tp33' into tp34 new 534746b Merge branch 'tp34' The 2 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 | 1 + docs/src/upgrade/release-3.3.x.asciidoc | 30 +++++ ...{LoopTraversal.java => PredicateTraversal.java} | 40 +++--- .../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 | 6 + 10 files changed, 263 insertions(+), 95 deletions(-) copy gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/lambda/{LoopTraversal.java => PredicateTraversal.java} (57%)