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 2016/05/06 12:16:08 UTC
[2/2] incubator-tinkerpop git commit: Merge remote-tracking branch
'origin/tp31'
Merge remote-tracking branch 'origin/tp31'
Conflicts:
gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyAndTest.groovy
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/09b87ea8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/09b87ea8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/09b87ea8
Branch: refs/heads/master
Commit: 09b87ea806ddaa2bb182fb85213e5f171b58fcd1
Parents: 7a98d2c 25c94c8
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri May 6 08:15:53 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri May 6 08:15:53 2016 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
docs/src/upgrade/release-3.1.x-incubating.asciidoc | 9 +++++++++
.../process/traversal/step/filter/GroovyAndTest.groovy | 2 +-
.../gremlin/process/traversal/step/filter/AndTest.java | 6 +++---
4 files changed, 14 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/09b87ea8/CHANGELOG.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/09b87ea8/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyAndTest.groovy
----------------------------------------------------------------------
diff --cc gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyAndTest.groovy
index 08db43a,af444a8..fb9d356
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyAndTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyAndTest.groovy
@@@ -30,8 -30,8 +30,8 @@@ public abstract class GroovyAndTest
public static class Traversals extends AndTest {
@Override
- public Traversal<Vertex, String> get_g_V_andXhasXage_gt_27X__outE_count_gt_2X_name() {
+ public Traversal<Vertex, String> get_g_V_andXhasXage_gt_27X__outE_count_gte_2X_name() {
- TraversalScriptHelper.compute("g.V.and(has('age',gt(27)), outE().count.is(gte(2l))).name", g)
+ new ScriptTraversal<>(g, "gremlin-groovy", "g.V.and(has('age',gt(27)), outE().count.is(gte(2l))).name")
}
@Override