Merge branch 'tp32'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/13a82956 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/13a82956 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/13a82956 Branch: refs/heads/master Commit: 13a829569fc094f2d5b1771f4cbd0b8ff2ce36d3 Parents: 5d7bf84 dd83c78 Author: Daniel Kuppitz <daniel_kupp...@hotmail.com> Authored: Sat Jan 20 18:10:49 2018 -0700 Committer: Daniel Kuppitz <daniel_kupp...@hotmail.com> Committed: Sat Jan 20 18:10:49 2018 -0700 ---------------------------------------------------------------------- CHANGELOG.asciidoc | 1 + .../traversal/step/util/ComputerAwareStep.java | 6 +++++ .../traversal/util/DefaultTraversal.java | 1 + .../traversal/step/branch/UnionTest.java | 23 ++++++++++++++------ 4 files changed, 24 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/13a82956/CHANGELOG.asciidoc ----------------------------------------------------------------------
