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/17 19:42:41 UTC

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

Branch: refs/heads/master
Commit: 60f2550abc011022c319ed255c2173c8a2abe110
Parents: 51f3843 2f2fc62
Author: Stephen Mallette <sp...@apache.org>
Authored: Tue Mar 17 12:45:23 2015 -0400
Committer: Stephen Mallette <sp...@apache.org>
Committed: Tue Mar 17 12:45:23 2015 -0400

----------------------------------------------------------------------
 CHANGELOG.asciidoc                              |   2 +-
 .../process/graph/traversal/GraphTraversal.java |  27 +++-
 .../traversal/step/map/AddEdgeByPathStep.java   |  78 +++++++++++
 .../graph/traversal/step/map/AddEdgeStep.java   |  49 +++----
 .../step/sideEffect/AddPropertyStep.java        |  11 ++
 .../strategy/decoration/ReadOnlyStrategy.java   |   4 +-
 .../traversal/step/filter/GroovyHasTest.groovy  |   4 +-
 .../traversal/step/map/GroovyAddEdgeTest.groovy |   5 +
 .../graph/traversal/step/filter/HasTest.java    |   8 +-
 .../graph/traversal/step/map/AddEdgeTest.java   |  48 +++++--
 .../tinkerpop/gremlin/hadoop/Constants.java     |   2 +-
 .../computer/example/TraversalSupplier1.java    |   2 +-
 .../computer/example/TraversalSupplier2.java    |   2 +-
 .../computer/example/TraversalSupplier3.java    |   2 +-
 .../computer/giraph/GiraphGraphComputer.java    |   4 +-
 .../computer/spark/SparkGraphComputer.java      |  10 +-
 .../spark/util/SApacheConfiguration.java        |  70 ----------
 .../computer/spark/util/SparkHelper.java        |   2 +-
 .../process/computer/util/MapReduceHelper.java  |   2 +-
 .../hadoop/structure/HadoopConfiguration.java   |  73 +++++-----
 .../hadoop/structure/io/InputOutputHelper.java  |  44 +++---
 .../io/graphson/GraphSONRecordReader.java       |  14 +-
 .../structure/io/gryo/GryoRecordReader.java     |  66 +++++++--
 .../structure/io/gryo/GryoRecordWriter.java     |   2 +-
 .../structure/io/gryo/VertexStreamIterator.java | 138 -------------------
 .../hadoop/structure/util/HadoopHelper.java     |  13 +-
 .../io/gryo/GryoRecordReaderWriterTest.java     |   2 +-
 .../io/gryo/VertexStreamIteratorTest.java       |  99 -------------
 28 files changed, 339 insertions(+), 444 deletions(-)
----------------------------------------------------------------------