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/06/26 14:24:50 UTC

[6/8] incubator-tinkerpop git commit: Merge remote-tracking branch 'origin/master'

Merge remote-tracking branch 'origin/master'


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

Branch: refs/heads/resultset-refactor
Commit: 5f3f1a2c7c446b5ad87b2958f10ca16d6f426b37
Parents: 6b61474 6a94788
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri Jun 26 08:09:08 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri Jun 26 08:09:08 2015 -0400

----------------------------------------------------------------------
 bin/gephi.mock                                  |  24 ++++
 bin/process-docs.sh                             |   2 +
 docs/src/gremlin-applications.asciidoc          |  74 +++++-------
 docs/src/implementations.asciidoc               |   2 +-
 docs/src/intro.asciidoc                         |   6 +-
 docs/src/the-traversal.asciidoc                 |  54 +++++----
 .../traversal/dsl/graph/GraphTraversal.java     |   6 +-
 .../gremlin/process/traversal/dsl/graph/__.java |   7 --
 .../process/traversal/step/map/MatchStep.java   | 118 ++++++++++++-------
 .../optimization/MatchPredicateStrategy.java    |   5 +-
 .../traversal/step/map/MatchStepTest.java       |  56 ++++++---
 .../MatchPredicateStrategyTest.java             |   5 +-
 .../traversal/step/map/GroovyMatchTest.groovy   |  74 ++++++------
 .../process/TraversalPerformanceTest.java       |   2 +-
 .../process/traversal/step/map/MatchTest.java   | 104 ++++++++--------
 .../neo4j/process/NativeNeo4jCypherTest.java    |  16 +--
 .../tinkergraph/structure/TinkerGraphTest.java  |  20 ++--
 17 files changed, 321 insertions(+), 254 deletions(-)
----------------------------------------------------------------------