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/06/11 20:58:10 UTC

[3/3] incubator-tinkerpop git commit: Merge branch 'master' into xmatch

Merge branch 'master' into xmatch


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

Branch: refs/heads/xmatch
Commit: 9d1978dc7270ab2ce8c818957dc348e8c121be3d
Parents: e43843e 93b5553
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Thu Jun 11 12:58:01 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Thu Jun 11 12:58:01 2015 -0600

----------------------------------------------------------------------
 .../traversal/dsl/graph/GraphTraversal.java     | 25 ++++++++++++++++----
 .../gremlin/process/traversal/dsl/graph/__.java | 18 ++++++++++++++
 .../gremlin/process/traversal/step/Scoping.java | 17 +++++++++----
 .../traversal/step/filter/WhereStep.java        |  3 +--
 .../traversal/step/map/SelectOneStep.java       |  7 ++++--
 .../process/traversal/step/map/SelectStep.java  |  9 ++++---
 6 files changed, 64 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/9d1978dc/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
----------------------------------------------------------------------