Merge branch 'TINKERPOP-1650' into tp32
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/1fa01ef7 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/1fa01ef7 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/1fa01ef7 Branch: refs/heads/TINKERPOP-1784 Commit: 1fa01ef7014b6f2b3044ee6fc673e18d318acb09 Parents: dd48dcc 73a982c Author: Ted Wilmes <[email protected]> Authored: Wed Oct 11 14:19:16 2017 -0500 Committer: Ted Wilmes <[email protected]> Committed: Wed Oct 11 14:19:16 2017 -0500 ---------------------------------------------------------------------- CHANGELOG.asciidoc | 1 + .../gremlin/process/traversal/step/PathProcessor.java | 2 +- .../process/traversal/step/filter/DedupGlobalStep.java | 4 ++-- .../gremlin/process/traversal/step/filter/PathFilterStep.java | 5 +++-- .../process/traversal/step/filter/WherePredicateStep.java | 4 ++-- .../process/traversal/step/filter/WhereTraversalStep.java | 2 +- .../gremlin/process/traversal/step/map/MatchStep.java | 4 ++-- .../gremlin/process/traversal/step/map/PathStep.java | 5 +++-- .../gremlin/process/traversal/step/map/SelectOneStep.java | 5 +++-- .../gremlin/process/traversal/step/map/SelectStep.java | 4 ++-- .../gremlin/process/traversal/step/map/TreeStep.java | 5 +++-- .../process/traversal/step/sideEffect/TreeSideEffectStep.java | 5 +++-- .../strategy/optimization/PathRetractionStrategy.java | 7 ++++--- .../strategy/optimization/PathRetractionStrategyTest.java | 6 +++++- 14 files changed, 35 insertions(+), 24 deletions(-) ----------------------------------------------------------------------
