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/768ade6b Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/768ade6b Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/768ade6b Branch: refs/heads/master Commit: 768ade6bdc853c556d0a2812005be4796bb261f9 Parents: 9a39bde b717615 Author: Marko A. Rodriguez <[email protected]> Authored: Thu Feb 16 11:09:42 2017 -0700 Committer: Marko A. Rodriguez <[email protected]> Committed: Thu Feb 16 11:09:42 2017 -0700 ---------------------------------------------------------------------- CHANGELOG.asciidoc | 3 ++- .../upgrade/release-3.2.x-incubating.asciidoc | 26 ++++++++++++++++++++ .../strategy/decoration/RemoteStrategy.java | 1 - .../optimization/LazyBarrierStrategy.java | 2 +- .../optimization/LazyBarrierStrategyTest.java | 19 +++++++------- .../gremlin/server/util/TraverserIterator.java | 21 +++++++++++++--- .../Neo4jGraphStepStrategyTest.java | 2 +- .../TinkerGraphStepStrategyTest.java | 2 +- 8 files changed, 58 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/768ade6b/CHANGELOG.asciidoc ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/768ade6b/docs/src/upgrade/release-3.2.x-incubating.asciidoc ----------------------------------------------------------------------
