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/05/07 20:22:05 UTC

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

Branch: refs/heads/master
Commit: 4a1e5121c734a8dbd5e5318a547a9d19ed4712c9
Parents: 4845c13 36f4a87
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu May 7 13:20:26 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu May 7 13:20:26 2015 -0400

----------------------------------------------------------------------
 CHANGELOG.asciidoc                              |  2 +
 docs/src/the-traversal.asciidoc                 |  6 +--
 .../process/traversal/TraversalStrategies.java  |  2 +
 .../traversal/dsl/graph/GraphTraversal.java     | 12 ++++-
 .../gremlin/process/traversal/step/Scoping.java | 32 +++++++++++
 .../traversal/step/filter/WhereStep.java        |  9 +++-
 .../traversal/step/map/SelectOneStep.java       | 20 +++++--
 .../process/traversal/step/map/SelectStep.java  | 21 ++++++--
 .../traversal/step/map/match/MatchStep.java     | 17 ++++--
 .../strategy/finalization/ScopingStrategy.java  | 57 ++++++++++++++++++++
 .../process/traversal/util/TraversalHelper.java |  4 +-
 .../traversal/step/map/GroovyMatchTest.groovy   | 12 +++--
 .../process/traversal/step/map/MatchTest.java   | 14 +++--
 pom.xml                                         | 17 +++++-
 .../TinkerGraphNoStrategyComputerProvider.java  |  2 +
 .../process/TinkerGraphNoStrategyProvider.java  |  7 ++-
 16 files changed, 198 insertions(+), 36 deletions(-)
----------------------------------------------------------------------