Merge branch 'TINKERPOP-1508' into tp32
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/f55cb359 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/f55cb359 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/f55cb359 Branch: refs/heads/TINKERPOP-1534 Commit: f55cb359363c61727a1c666dc4dbd2331bf6fd87 Parents: eb1dfb8 659865b Author: Marko A. Rodriguez <okramma...@gmail.com> Authored: Wed Nov 2 06:45:57 2016 -0600 Committer: Marko A. Rodriguez <okramma...@gmail.com> Committed: Wed Nov 2 06:45:57 2016 -0600 ---------------------------------------------------------------------- CHANGELOG.asciidoc | 1 + docs/src/reference/the-traversal.asciidoc | 15 +++++++++++++-- docs/src/upgrade/release-3.2.x-incubating.asciidoc | 17 +++++++++++++++++ .../traversal/dsl/graph/GraphTraversal.java | 12 ++++++++++++ .../gremlin/process/traversal/dsl/graph/__.java | 14 ++++++++++++++ .../process/traversal/step/branch/BranchStep.java | 11 +++-------- .../traversal/step/branch/ChooseStepTest.java | 11 +++++++++-- .../traversal/step/branch/GroovyChooseTest.groovy | 5 +++++ .../process/traversal/step/branch/ChooseTest.java | 16 ++++++++++++++++ 9 files changed, 90 insertions(+), 12 deletions(-) ----------------------------------------------------------------------
