You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2017/04/18 20:29:59 UTC
[5/6] tinkerpop git commit: Merge branch 'TINKERPOP-1044-master'
Merge branch 'TINKERPOP-1044-master'
Conflicts:
gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/IteratorHandler.java
gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/NioGremlinResponseEncoder.java
gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/WsGremlinResponseEncoder.java
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/0eba268b
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/0eba268b
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/0eba268b
Branch: refs/heads/master
Commit: 0eba268b4f0f3ce856098d11dbff453929734cfa
Parents: 3d857cb 92eceb4
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Apr 18 15:20:00 2017 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Apr 18 15:20:00 2017 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 2 ++
.../upgrade/release-3.2.x-incubating.asciidoc | 35 ++++++++++++++++++
.../tinkerpop/gremlin/driver/Handler.java | 11 ++++--
.../apache/tinkerpop/gremlin/driver/Tokens.java | 3 ++
.../driver/exception/ResponseException.java | 27 ++++++++++++++
.../gremlin/driver/message/ResponseMessage.java | 19 ++++++++++
.../gremlin/driver/ResultQueueTest.java | 2 --
.../handler/GremlinResponseFrameEncoder.java | 6 ++--
.../handler/HttpGremlinEndpointHandler.java | 9 +++--
.../server/handler/OpExecutorHandler.java | 1 +
.../server/handler/OpSelectorHandler.java | 4 ++-
.../server/op/AbstractEvalOpProcessor.java | 27 ++++++++++----
.../gremlin/server/op/AbstractOpProcessor.java | 5 +--
.../op/traversal/TraversalOpProcessor.java | 35 +++++++++++++-----
.../gremlin/server/util/ExceptionHelper.java | 38 ++++++++++++++++++++
.../server/GremlinDriverIntegrateTest.java | 5 +++
.../server/GremlinServerHttpIntegrateTest.java | 8 +++++
17 files changed, 210 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0eba268b/CHANGELOG.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0eba268b/docs/src/upgrade/release-3.2.x-incubating.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0eba268b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/HttpGremlinEndpointHandler.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0eba268b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/OpSelectorHandler.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0eba268b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0eba268b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/traversal/TraversalOpProcessor.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0eba268b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0eba268b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerHttpIntegrateTest.java
----------------------------------------------------------------------