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/13 13:06:01 UTC

[2/2] 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/a5147c1f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/a5147c1f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/a5147c1f

Branch: refs/heads/master
Commit: a5147c1f9ef6b42cf68b9a15f0d4717dd0abf9c8
Parents: 6a4be11 859b3df
Author: Stephen Mallette <sp...@apache.org>
Authored: Fri Mar 13 08:05:53 2015 -0400
Committer: Stephen Mallette <sp...@apache.org>
Committed: Fri Mar 13 08:05:53 2015 -0400

----------------------------------------------------------------------
 .../gremlin/structure/io/gryo/GryoReader.java   | 12 +++--
 .../structure/util/detached/DetachedEdge.java   | 14 +++++-
 .../computer/giraph/GiraphComputeVertex.java    | 30 ++++---------
 .../computer/giraph/GiraphWorkerContext.java    |  9 +++-
 .../computer/giraph/io/GiraphVertexReader.java  | 10 +++--
 .../computer/giraph/io/GiraphVertexWriter.java  |  8 ++--
 .../computer/spark/util/SparkHelper.java        |  2 +-
 .../hadoop/structure/io/VertexWritable.java     | 20 ++++++---
 .../io/graphson/GraphSONRecordReader.java       | 10 ++---
 .../structure/io/gryo/GryoRecordWriter.java     |  4 +-
 .../structure/io/gryo/VertexStreamIterator.java | 18 +++++---
 .../structure/io/script/ScriptRecordReader.java | 10 ++---
 .../io/gryo/VertexStreamIteratorTest.java       | 47 ++++++++++++++++++++
 .../tinkergraph/structure/TinkerEdge.java       | 10 ++++-
 14 files changed, 139 insertions(+), 65 deletions(-)
----------------------------------------------------------------------