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/02/22 14:20:07 UTC

[15/15] incubator-tinkerpop git commit: Merge remote-tracking branch 'origin/tp31'

Merge remote-tracking branch 'origin/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/5dd337da
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/5dd337da
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/5dd337da

Branch: refs/heads/master
Commit: 5dd337daae8edc173d576fa970769df4fa83a480
Parents: e23c00b f8cbe8f
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Feb 22 08:19:23 2016 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Feb 22 08:19:23 2016 -0500

----------------------------------------------------------------------
 appveyor.yml                                    |  14 ++++++
 docs/static/images/gremlin-conductor.png        | Bin 0 -> 38958 bytes
 .../groovy/engine/GremlinExecutorTest.java      |   8 ++--
 .../groovy/engine/ScriptEnginesTest.java        |   5 ++-
 .../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 ++--
 9 files changed, 103 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/5dd337da/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/5dd337da/spark-gremlin/pom.xml
----------------------------------------------------------------------