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/03/18 16:16:40 UTC

[4/4] incubator-tinkerpop git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-tinkerpop

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-tinkerpop


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

Branch: refs/heads/master
Commit: 86140cdd606ddb03e85cb48d89bd7680dad5e73a
Parents: ae7127d 0c3b036
Author: Stephen Mallette <sp...@apache.org>
Authored: Wed Mar 18 11:16:27 2015 -0400
Committer: Stephen Mallette <sp...@apache.org>
Committed: Wed Mar 18 11:16:27 2015 -0400

----------------------------------------------------------------------
 hadoop-gremlin/conf/giraph-graphson.properties  | 57 --------------------
 hadoop-gremlin/conf/giraph-gryo.properties      | 41 --------------
 hadoop-gremlin/conf/hadoop-graphson.properties  | 35 ++++++++++++
 hadoop-gremlin/conf/hadoop-gryo.properties      | 48 +++++++++++++++++
 hadoop-gremlin/conf/spark-gryo.properties       | 39 --------------
 .../computer/spark/SparkGraphComputer.java      |  4 +-
 .../computer/spark/util/SparkHelper.java        | 14 +++--
 7 files changed, 96 insertions(+), 142 deletions(-)
----------------------------------------------------------------------