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 2016/09/16 11:47:00 UTC

[1/2] tinkerpop git commit: Merge remote-tracking branch 'origin/tp31' [Forced Update!]

Repository: tinkerpop
Updated Branches:
  refs/heads/TINKERPOP-1442-master 1a2ba9759 -> 1e248531a (forced update)


Merge remote-tracking branch 'origin/tp31'


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

Branch: refs/heads/TINKERPOP-1442-master
Commit: 14bca062cf4deb15f00b99b09b1bd746a2dca1e8
Parents: c2c0023 e7e7481
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri Sep 16 07:44:14 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri Sep 16 07:44:14 2016 -0400

----------------------------------------------------------------------

----------------------------------------------------------------------



[2/2] tinkerpop git commit: Merge branch 'TINKERPOP-1442' into TINKERPOP-1442-master

Posted by sp...@apache.org.
Merge branch 'TINKERPOP-1442' into TINKERPOP-1442-master


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

Branch: refs/heads/TINKERPOP-1442-master
Commit: 1e248531ad2fa0a3a4507ca499214b7a730ec3a8
Parents: 14bca06 75baf01
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri Sep 16 07:46:28 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri Sep 16 07:46:28 2016 -0400

----------------------------------------------------------------------
 CHANGELOG.asciidoc                              |  1 +
 .../tinkerpop/gremlin/driver/Connection.java    |  2 +-
 .../gremlin/groovy/engine/GremlinExecutor.java  |  2 +-
 .../gremlin/server/op/session/Session.java      | 12 +++++++
 .../server/op/session/SessionOpProcessor.java   |  9 ++++++
 .../server/GremlinDriverIntegrateTest.java      |  2 +-
 .../server/GremlinServerIntegrateTest.java      |  4 +--
 .../GremlinServerSessionIntegrateTest.java      | 33 ++++++++++++++++++++
 8 files changed, 60 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


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

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1e248531/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Connection.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1e248531/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/engine/GremlinExecutor.java
----------------------------------------------------------------------

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

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