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:47:01 UTC
[19/19] incubator-tinkerpop git commit: Merge branch 'master' into
TINKERPOP-1140
Merge branch 'master' into TINKERPOP-1140
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/e2e38e69
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/e2e38e69
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/e2e38e69
Branch: refs/heads/TINKERPOP-1140
Commit: e2e38e691ee20ba697c2e737e678376a10f87da2
Parents: a4cf151 be3ebc1
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Thu Feb 11 12:46:28 2016 -0700
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Thu Feb 11 12:46:28 2016 -0700
----------------------------------------------------------------------
.travis.yml | 3 +-
CHANGELOG.asciidoc | 11 +
data/script-input.groovy | 9 +-
docs/src/reference/implementations.asciidoc | 17 +-
.../upgrade/release-3.2.x-incubating.asciidoc | 10 +
.../traversal/util/TraversalExplanation.java | 11 +-
.../gremlin/structure/io/gryo/GryoMapper.java | 8 +-
.../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 +++++++------------
.../io/script/script-input-grateful-dead.groovy | 2 +-
.../structure/io/script/script-input.groovy | 14 +-
.../structure/io/script/ScriptRecordReader.java | 35 +-
16 files changed, 332 insertions(+), 300 deletions(-)
----------------------------------------------------------------------