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/f5558cd0 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/f5558cd0 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/f5558cd0 Branch: refs/heads/master Commit: f5558cd02904c748de3b3cbd403b4858218d5ec1 Parents: 945b2be 71dd939 Author: Stephen Mallette <sp...@genoprime.com> Authored: Thu Dec 1 13:11:58 2016 -0500 Committer: Stephen Mallette <sp...@genoprime.com> Committed: Thu Dec 1 13:11:58 2016 -0500 ---------------------------------------------------------------------- .../apache/tinkerpop/gremlin/process/traversal/Bindings.java | 2 +- .../tinkerpop/gremlin/process/traversal/TraversalEngine.java | 2 +- .../gremlin/process/traversal/TraversalSideEffects.java | 8 ++++---- .../tinkerpop/gremlin/process/traversal/TraversalSource.java | 2 +- .../gremlin/process/traversal/step/map/GroupStepV3d0.java | 2 +- .../traversal/step/map/LambdaCollectingBarrierStep.java | 2 +- .../traversal/strategy/decoration/SubgraphStrategy.java | 4 ++-- .../gremlin/process/traversal/util/TraversalHelper.java | 2 +- .../gremlin/hadoop/structure/HadoopConfiguration.java | 4 ++-- 9 files changed, 14 insertions(+), 14 deletions(-) ----------------------------------------------------------------------
