You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by dk...@apache.org on 2015/05/11 13:44:06 UTC

[35/50] [abbrv] 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/b4a1c8d9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/b4a1c8d9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/b4a1c8d9

Branch: refs/heads/TINKERPOP3-666
Commit: b4a1c8d9c20cda9e9e8c2c453ee9949b111a01c1
Parents: 77957a3 179b339
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Sat May 9 06:12:48 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Sat May 9 06:12:48 2015 -0400

----------------------------------------------------------------------
 .../computer/util/ConfigurationTraversal.java        |  2 --
 .../process/traversal/dsl/graph/GraphTraversal.java  | 15 ++++++++++++---
 .../process/traversal/step/filter/HasStep.java       |  2 +-
 .../process/traversal/step/map/OrderGlobalStep.java  |  2 +-
 .../process/traversal/step/map/OrderLocalStep.java   |  4 ++--
 .../process/traversal/step/util/HasContainer.java    |  6 ++++--
 .../org/apache/tinkerpop/gremlin/structure/P.java    | 11 +++++++++++
 7 files changed, 31 insertions(+), 11 deletions(-)
----------------------------------------------------------------------