[14/50] [abbrv] tinkerpop git commit: Merge branch 'tp32' into tp33

2018-07-29 Thread dkuppitz 
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-1990
Commit: c3981000234faf03f4ea4bc1da8086bc34fb3140
Parents: 05432a7 f9ad72a
Author: Daniel Kuppitz 
Authored: Mon Jul 23 10:01:23 2018 -0700
Committer: Daniel Kuppitz 
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
--

[14/50] [abbrv] tinkerpop git commit: Merge branch 'tp32' into tp33

2018-04-25 Thread dkuppitz 
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/81add608
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/81add608
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/81add608

Branch: refs/heads/TINKERPOP-1447
Commit: 81add608549846e5f45e4e1a504e5e3cea6e03f9
Parents: 7e6e985 682f298
Author: Stephen Mallette 
Authored: Fri Apr 20 19:29:17 2018 -0400
Committer: Stephen Mallette 
Committed: Fri Apr 20 19:29:17 2018 -0400

--

--