Merge branch 'TINKERPOP-1492'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/ce41db1d Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ce41db1d Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/ce41db1d Branch: refs/heads/master Commit: ce41db1d26ac8fafc463442a52741102ea0c2b2a Parents: ba38f4e c328a42 Author: Marko A. Rodriguez <okramma...@gmail.com> Authored: Wed Oct 12 14:00:38 2016 -0600 Committer: Marko A. Rodriguez <okramma...@gmail.com> Committed: Wed Oct 12 14:00:38 2016 -0600 ---------------------------------------------------------------------- .../process/traversal/step/map/MatchStep.java | 2 +- .../optimization/LazyBarrierStrategy.java | 11 +++-- .../optimization/PathRetractionStrategy.java | 4 +- .../optimization/RepeatUnrollStrategy.java | 4 +- .../optimization/LazyBarrierStrategyTest.java | 49 +++++++++++--------- .../PathRetractionStrategyTest.java | 13 +++--- .../optimization/RepeatUnrollStrategyTest.java | 2 +- 7 files changed, 47 insertions(+), 38 deletions(-) ----------------------------------------------------------------------