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