You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by ok...@apache.org on 2016/01/05 23:54:44 UTC

[12/50] incubator-tinkerpop git commit: Merge remote-tracking branch 'origin/TINKERPOP-1045'

Merge remote-tracking branch 'origin/TINKERPOP-1045'


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

Branch: refs/heads/TINKERPOP-1033
Commit: f5963fc55b1e26ee34c878357d2327b0573163ea
Parents: 87dfadb 55752d3
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Dec 21 18:11:19 2015 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Dec 21 18:11:19 2015 -0500

----------------------------------------------------------------------
 CHANGELOG.asciidoc                              |  2 +
 .../server/handler/OpSelectorHandler.java       |  2 +-
 .../server/op/AbstractEvalOpProcessor.java      | 22 +++++++--
 .../server/op/control/ControlOpProcessor.java   | 18 ++++----
 .../server/op/session/SessionOpProcessor.java   |  6 +--
 .../server/op/standard/StandardOpProcessor.java |  6 +--
 .../server/GremlinDriverIntegrateTest.java      | 18 ++++++++
 .../server/GremlinServerIntegrateTest.java      | 48 +++++++++++++++++++-
 8 files changed, 100 insertions(+), 22 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/f5963fc5/CHANGELOG.asciidoc
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/f5963fc5/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/f5963fc5/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
----------------------------------------------------------------------