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/02/11 20:46:50 UTC
[08/19] incubator-tinkerpop git commit: Merge remote-tracking branch
'origin/TINKERPOP-916' into tp31
Merge remote-tracking branch 'origin/TINKERPOP-916' into tp31
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/c2688ef1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/c2688ef1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/c2688ef1
Branch: refs/heads/TINKERPOP-1140
Commit: c2688ef14b4147e93b0baefdf882f4037c061602
Parents: b2cfc38 30bfe3e
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Feb 10 15:01:26 2016 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Feb 10 15:01:26 2016 -0500
----------------------------------------------------------------------
.../gremlin/driver/simple/AbstractClient.java | 94 ++++++
.../gremlin/driver/simple/NioClient.java | 32 +-
.../gremlin/driver/simple/SimpleClient.java | 14 +
.../gremlin/driver/simple/WebSocketClient.java | 32 +-
.../server/GremlinDriverIntegrateTest.java | 13 +
.../server/GremlinServerIntegrateTest.java | 327 +++++++------------
6 files changed, 253 insertions(+), 259 deletions(-)
----------------------------------------------------------------------