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/02/06 23:15:13 UTC

[3/3] incubator-tinkerpop git commit: Merge remote-tracking branch 'dkuppitz/sca'

Merge remote-tracking branch 'dkuppitz/sca'


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

Branch: refs/heads/master
Commit: e6aba8437405ab4353f9b9f973a3f8dfd4d083ab
Parents: c354cf1 5e2c9a0
Author: Marko A. Rodriguez <ok...@apache.org>
Authored: Fri Feb 6 15:15:00 2015 -0700
Committer: Marko A. Rodriguez <ok...@apache.org>
Committed: Fri Feb 6 15:15:00 2015 -0700

----------------------------------------------------------------------
 .../com/tinkerpop/gremlin/process/Path.java     |  2 +-
 .../peerpressure/PeerPressureVertexProgram.java | 12 +++------
 .../computer/lambda/LambdaVertexProgram.java    |  2 +-
 .../traversal/TraversalVertexProgram.java       | 10 +++----
 .../computer/traversal/TraverserExecutor.java   | 10 +++----
 .../graph/traversal/step/branch/BranchStep.java | 26 ++++++++----------
 .../graph/traversal/step/map/CountStep.java     |  3 ++-
 .../graph/traversal/step/map/FoldStep.java      |  8 ++----
 .../traversal/step/map/match/MatchStep.java     | 10 +++----
 .../traversal/step/sideEffect/GraphStep.java    | 11 ++++----
 .../step/sideEffect/SideEffectCapStep.java      |  9 ++-----
 .../gremlin/process/graph/util/Tree.java        | 16 ++++-------
 .../process/traverser/B_O_Traverser.java        |  4 +--
 .../gremlin/process/util/path/MutablePath.java  | 18 +++++++------
 .../structure/io/graphml/GraphMLWriter.java     | 26 +++++-------------
 .../io/graphml/GraphMLWriterHelper.java         |  2 +-
 .../structure/io/graphson/GraphSONModule.java   | 16 +++++------
 .../structure/io/graphson/GraphSONVertex.java   |  2 +-
 .../io/graphson/GraphSONVertexProperty.java     |  4 +--
 .../structure/io/graphson/GraphSONWriter.java   | 16 +++++------
 .../io/graphson/LegacyGraphSONReader.java       |  4 +--
 .../gremlin/structure/io/kryo/KryoReader.java   | 26 +++++-------------
 .../gremlin/structure/strategy/IdStrategy.java  |  6 ++---
 .../structure/strategy/PartitionStrategy.java   | 28 ++++++++++++++------
 .../tinkergraph/structure/TinkerGraphTest.java  | 21 +++------------
 25 files changed, 119 insertions(+), 173 deletions(-)
----------------------------------------------------------------------