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 2015/11/05 02:57:04 UTC

[46/50] [abbrv] incubator-tinkerpop git commit: Merge remote-tracking branch 'origin/master'

Merge remote-tracking branch 'origin/master'


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

Branch: refs/heads/TINKERPOP3-923
Commit: 863bdab1f62b82001efabc1cd06b87382d2d263b
Parents: 88abff6 c4fcae6
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Nov 4 14:36:30 2015 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Nov 4 14:36:30 2015 -0500

----------------------------------------------------------------------
 CHANGELOG.asciidoc                              |   2 +
 docs/src/implementations.asciidoc               |   9 ++
 docs/src/the-graphcomputer.asciidoc             |   4 +
 .../computer/bulkloading/BulkLoader.java        |  31 +++++
 .../bulkloading/BulkLoaderVertexProgram.java    | 115 ++++++++++++++++---
 .../bulkloading/IncrementalBulkLoader.java      |  14 ++-
 .../process/computer/SparkGraphComputer.java    |  32 ++++++
 .../process/computer/LocalPropertyTest.java     | 100 ++++++++++++++++
 .../structure/TinkerGraphPlayTest.java          |  19 ++-
 9 files changed, 304 insertions(+), 22 deletions(-)
----------------------------------------------------------------------