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 2015/12/02 20:12:13 UTC

[10/10] incubator-tinkerpop git commit: Merge branch 'master' into TINKERPOP3-1011

Merge branch 'master' into TINKERPOP3-1011


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

Branch: refs/heads/TINKERPOP3-1011
Commit: 311e8abe733995f970d2b1aeb8153584b6ba3024
Parents: c374f4e 59eaa06
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Wed Dec 2 12:11:53 2015 -0700
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Wed Dec 2 12:11:53 2015 -0700

----------------------------------------------------------------------
 CHANGELOG.asciidoc                              |  2 +
 docs/src/dev/developer/release.asciidoc         |  1 +
 docs/src/reference/the-graph.asciidoc           | 28 +++----
 .../process/computer/GiraphGraphComputer.java   | 11 ++-
 .../bulkloading/BulkLoaderVertexProgram.java    |  4 +-
 .../computer/util/ComputerSubmissionHelper.java | 80 ++++++++++++++++++++
 .../process/computer/SparkGraphComputer.java    |  9 ++-
 7 files changed, 117 insertions(+), 18 deletions(-)
----------------------------------------------------------------------