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 2015/09/18 21:48:08 UTC

[3/4] incubator-tinkerpop git commit: Merge remote-tracking branch 'origin/tp30'

Merge remote-tracking branch 'origin/tp30'


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

Branch: refs/heads/master
Commit: feea0110c342f96cac0404791ea3778b3ae0bae7
Parents: cf6c455 0d3dfa6
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri Sep 18 15:26:23 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri Sep 18 15:26:23 2015 -0400

----------------------------------------------------------------------
 CHANGELOG.asciidoc                              |  1 +
 .../tinkerpop/gremlin/server/GremlinServer.java | 11 ++++++
 .../tinkerpop/gremlin/server/OpProcessor.java   |  4 +-
 .../tinkerpop/gremlin/server/op/OpLoader.java   | 14 ++++++-
 .../server/op/control/ControlOpProcessor.java   |  6 +++
 .../gremlin/server/op/session/Session.java      | 40 +++++++++++++-------
 .../server/op/session/SessionOpProcessor.java   |  6 +++
 .../server/op/standard/StandardOpProcessor.java |  6 +++
 .../server/GremlinServerIntegrateTest.java      |  1 +
 9 files changed, 74 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


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

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/feea0110/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/session/Session.java
----------------------------------------------------------------------