Merge branch 'TINKERPOP-1705'

Conflicts:
        CHANGELOG.asciidoc


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

Branch: refs/heads/master
Commit: 0fcd883a34f609218d83f5677ddc0b7921bb7c35
Parents: 1c10bf5 301e3a0
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Apr 16 08:00:50 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Apr 16 08:00:50 2018 -0400

----------------------------------------------------------------------
 CHANGELOG.asciidoc                              |  3 +-
 .../apache/tinkerpop/gremlin/driver/Client.java | 71 +-------------------
 .../apache/tinkerpop/gremlin/driver/Tokens.java |  6 --
 .../handler/HttpGremlinEndpointHandler.java     | 30 +--------
 .../gremlin/server/op/AbstractOpProcessor.java  | 18 ++---
 .../server/op/session/SessionOpProcessor.java   | 17 +----
 .../server/op/standard/StandardOpProcessor.java | 18 +----
 .../server/GremlinDriverIntegrateTest.java      | 29 +-------
 .../server/GremlinServerHttpIntegrateTest.java  | 54 ---------------
 .../server/GremlinServerIntegrateTest.java      | 18 -----
 10 files changed, 17 insertions(+), 247 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0fcd883a/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --cc CHANGELOG.asciidoc
index 9ee873e,534030e..532d24f
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -23,14 -23,12 +23,15 @@@ NEED AND IMAG
  [[release-3-4-0]]
  === TinkerPop 3.4.0 (Release Date: NOT OFFICIALLY RELEASED YET)
  
- This release also includes changes from <<release-3-3-2, 3.3.2>>.
+ This release also includes changes from <<release-3-3-3, 3.3.3>>.
  
 +* `min()` and `max()` now support all types implementing `Comparable`.
  * Change the `toString()` of `Path` to be standardized as other graph 
elements are.
 +* `hadoop-gremlin` no longer generates a test artifact.
  * Fixed a bug in `ReducingBarrierStep`, that returned the provided seed value 
despite no elements being available.
  * Changed the order of `select()` scopes. The order is now: maps, 
side-effects, paths.
 +* Moved `TraversalEngine` to `gremlin-test` as it has long been only used in 
testing infrastructure.
+ * Removed previously deprecated `rebindings` options from the Java driver API.
  * Removed support for Giraph.
  
  == TinkerPop 3.3.0 (Gremlin Symphony #40 in G Minor)

Reply via email to