Merge remote-tracking branch 'origin/tp31'
Conflicts:
gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovySackTest.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/67fd4ee9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/67fd4ee9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/67fd4ee9
Branch: refs/heads/master
Commit: 67fd4ee96c9ff399a3ee0abdde64b9a31a6c19c5
Parents: 6113c92 63e849c
Author: Stephen Mallette <[email protected]>
Authored: Thu May 26 15:44:08 2016 -0400
Committer: Stephen Mallette <[email protected]>
Committed: Thu May 26 15:44:08 2016 -0400
----------------------------------------------------------------------
.../process/traversal/step/sideEffect/GroovySackTest.groovy | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/67fd4ee9/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovySackTest.groovy
----------------------------------------------------------------------
diff --cc
gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovySackTest.groovy
index 4c63351,828f664..d48416a
---
a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovySackTest.groovy
+++
b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovySackTest.groovy
@@@ -62,7 -62,7 +62,7 @@@ public abstract class GroovySackTest
@Override
public Traversal<Vertex, Double>
get_g_withSackX1_sumX_VX1X_localXoutXknowsX_barrierXnormSackXX_inXknowsX_barrier_sack(
final Object v1Id) {
- new ScriptTraversal<>(g, "gremlin-groovy",
"g.withSack(1.0d,sum).V(${v1Id}).local(out('knows').barrier(normSack)).in('knows').barrier.sack",
"v1Id", v1Id)
-
TraversalScriptHelper.compute("g.withSack(1.0d,sum).V(v1Id).local(out('knows').barrier(normSack)).in('knows').barrier.sack",
g, "v1Id", v1Id)
++ new ScriptTraversal<>(g, "gremlin-groovy",
"g.withSack(1.0d,sum).V(v1Id).local(out('knows').barrier(normSack)).in('knows').barrier.sack",
"v1Id", v1Id)
}
@Override
