You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by mh...@apache.org on 2015/07/22 18:55:14 UTC

[2/3] incubator-tinkerpop git commit: TINKERPOP3-779: Make coalesce children global instead of local

TINKERPOP3-779: Make coalesce children global instead of local


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

Branch: refs/heads/TINKERPOP3-779-coalesce-retain-path
Commit: 848008252300881591c17fe204ecfd72902390e5
Parents: a1c1779
Author: mhfrantz <mf...@redsealnetworks.com>
Authored: Wed Jul 22 09:31:50 2015 -0700
Committer: mhfrantz <mf...@redsealnetworks.com>
Committed: Wed Jul 22 09:31:50 2015 -0700

----------------------------------------------------------------------
 .../tinkerpop/gremlin/process/traversal/step/map/CoalesceStep.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/84800825/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/CoalesceStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/CoalesceStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/CoalesceStep.java
index 2f88001..b65bb5a 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/CoalesceStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/CoalesceStep.java
@@ -60,7 +60,7 @@ public final class CoalesceStep<S, E> extends FlatMapStep<S, E> implements Trave
     }
 
     @Override
-    public List<Traversal.Admin<S, E>> getLocalChildren() {
+    public List<Traversal.Admin<S, E>> getGlobalChildren() {
         return Collections.unmodifiableList(this.coalesceTraversals);
     }