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/24 00:22:28 UTC
[35/35] incubator-tinkerpop git commit: Merge branch 'master' into
TINKERPOP-1166
Merge branch 'master' into TINKERPOP-1166
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/90e862d7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/90e862d7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/90e862d7
Branch: refs/heads/TINKERPOP-1166
Commit: 90e862d76ee23d8e03f1b954be4276cd09f707ed
Parents: 14d0d48 5dd337d
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Tue Feb 23 16:21:35 2016 -0700
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Tue Feb 23 16:21:35 2016 -0700
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
appveyor.yml | 14 +
docs/preprocessor/preprocess-file.sh | 29 +-
docs/preprocessor/preprocess.sh | 2 +-
docs/src/dev/developer/contributing.asciidoc | 22 +-
docs/src/dev/developer/release.asciidoc | 39 +-
.../reference/implementations-hadoop.asciidoc | 929 +++++++++
.../reference/implementations-intro.asciidoc | 545 ++++++
.../reference/implementations-neo4j.asciidoc | 261 +++
.../implementations-tinkergraph.asciidoc | 144 ++
docs/src/reference/implementations.asciidoc | 1835 ------------------
docs/src/reference/index.asciidoc | 5 +-
.../the-gremlin-console/index.asciidoc | 2 +
docs/static/images/gremlin-conductor.png | Bin 0 -> 38958 bytes
.../tinkerpop/gremlin/driver/Connection.java | 62 +-
.../groovy/engine/GremlinExecutorTest.java | 11 +-
.../groovy/engine/ScriptEnginesTest.java | 5 +-
.../server/op/AbstractEvalOpProcessor.java | 55 +-
.../gremlin/server/op/session/Session.java | 6 +-
.../server/op/session/SessionOpProcessor.java | 4 +-
.../server/GremlinServerIntegrateTest.java | 27 +
.../apache/tinkerpop/gremlin/TestHelper.java | 12 +-
.../gremlin/hadoop/HadoopGraphProvider.java | 6 +-
pom.xml | 44 +
spark-gremlin/pom.xml | 21 +
.../spark/structure/io/SparkContextStorage.java | 8 +-
26 files changed, 2169 insertions(+), 1920 deletions(-)
----------------------------------------------------------------------