Merge branch 'TINKERPOP-2029-master'

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

Branch: refs/heads/TINKERPOP-1913
Commit: 2199d47886c90daf5d7a002edc74b95e46d6e103
Parents: f9668cc 7386f63
Author: Daniel Kuppitz <daniel_kupp...@hotmail.com>
Authored: Tue Sep 18 07:32:35 2018 -0700
Committer: Daniel Kuppitz <daniel_kupp...@hotmail.com>
Committed: Tue Sep 18 07:32:35 2018 -0700

----------------------------------------------------------------------
 CHANGELOG.asciidoc                              |   1 +
 docs/src/reference/the-traversal.asciidoc       |   6 +-
 docs/src/upgrade/release-3.4.x.asciidoc         |  25 ++++
 .../strategy/decoration/ConnectiveStrategy.java |  83 ++++++++------
 .../decoration/ConnectiveStrategyTest.java      |  55 ++++-----
 .../optimization/InlineFilterStrategyTest.java  | 113 +++++++++++--------
 gremlin-test/features/filter/And.feature        |  13 ++-
 .../process/traversal/step/filter/AndTest.java  |  18 ++-
 8 files changed, 193 insertions(+), 121 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2199d478/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --cc CHANGELOG.asciidoc
index 98de5d2,377cb38..54f4f71
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -25,8 -25,8 +25,9 @@@ image::https://raw.githubusercontent.co
  
  This release also includes changes from <<release-3-3-3, 3.3.3>>.
  
+ * Rewrote `ConnectiveStrategy` to support an arbitrary number of infix 
notations in a single traversal.
  * GraphSON `MessageSerializer`s will automatically register the 
GremlinServerModule to a provided GraphSONMapper.
 +* Removed support for `-i` option in Gremlin Server which was previously 
deprecated.
  * Implemented `ShortestPathVertexProgram` and the `shortestPath()` step.
  * `AbstractGraphProvider` uses `g.io()` for loading test data.
  * Added the `io()` start step and `read()` and `write()` termination steps to 
the Gremlin language.

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2199d478/docs/src/upgrade/release-3.4.x.asciidoc
----------------------------------------------------------------------

Reply via email to