Merge branch 'TINKERPOP-1627' into tp32

Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/b717615d
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/b717615d
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/b717615d

Branch: refs/heads/TINKERPOP-1599
Commit: b717615dfe6176413f223316f925c975d81ba1c1
Parents: 4a328b9 b635c80
Author: Marko A. Rodriguez <okramma...@gmail.com>
Authored: Thu Feb 16 11:09:32 2017 -0700
Committer: Marko A. Rodriguez <okramma...@gmail.com>
Committed: Thu Feb 16 11:09:32 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/b717615d/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --cc CHANGELOG.asciidoc
index e3c78f9,30fb41e..de78d24
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -26,8 -26,8 +26,9 @@@ image::https://raw.githubusercontent.co
  TinkerPop 3.2.5 (Release Date: NOT OFFICIALLY RELEASED YET)
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  
 +* Refactor `SparkContext` handler to support external kill and stop 
operations.
- 
+ * Fixed an optimization bug in `LazyBarrierStrategy` around appending 
barriers to the end of a `Traversal`.
+ * `TraverserIterator` in GremlinServer is smart to try and bulk traversers 
prior to network I/O.
  
  [[release-3-2-4]]
  TinkerPop 3.2.4 (Release Date: February 8, 2017)

Reply via email to