Merge branch 'tp33'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/e0ffa3be Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/e0ffa3be Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/e0ffa3be Branch: refs/heads/TINKERPOP-1913 Commit: e0ffa3be37b83db50d3f613b4c5777a05e74b9fc Parents: acc7012 c398100 Author: Daniel Kuppitz <daniel_kupp...@hotmail.com> Authored: Mon Jul 23 10:01:39 2018 -0700 Committer: Daniel Kuppitz <daniel_kupp...@hotmail.com> Committed: Mon Jul 23 10:01:39 2018 -0700 ---------------------------------------------------------------------- .gitignore | 1 + CHANGELOG.asciidoc | 1 + docker/hadoop/.gitignore | 1 + .../traversal/step/branch/BranchStep.java | 51 +++++++++++++++++--- gremlin-test/features/branch/Choose.feature | 15 ++++++ .../traversal/step/branch/ChooseTest.java | 24 +++++++++ 6 files changed, 86 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e0ffa3be/CHANGELOG.asciidoc ----------------------------------------------------------------------