Merge remote-tracking branch 'origin/tp31'
Conflicts:
gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyAddEdgeTest.groovy
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/032536eb
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/032536eb
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/032536eb
Branch: refs/heads/TINKERPOP-1278
Commit: 032536eb4142871ca241f30d75dfd7564b370adf
Parents: 05b457d 3c4aaf5
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri Jul 8 16:45:17 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri Jul 8 16:45:17 2016 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
docs/src/upgrade/release-3.1.x-incubating.asciidoc | 5 +++++
.../process/traversal/dsl/graph/GraphTraversal.java | 2 +-
.../process/traversal/step/map/GroovyAddEdgeTest.groovy | 4 ++--
.../gremlin/process/traversal/step/map/AddEdgeTest.java | 8 ++++----
.../strategy/decoration/PartitionStrategyProcessTest.java | 8 ++++----
.../org/apache/tinkerpop/gremlin/structure/EdgeTest.java | 2 +-
.../apache/tinkerpop/gremlin/structure/PropertyTest.java | 10 +++++-----
.../org/apache/tinkerpop/gremlin/structure/io/IoTest.java | 6 +++---
9 files changed, 26 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/032536eb/CHANGELOG.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/032536eb/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/032536eb/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyAddEdgeTest.groovy
----------------------------------------------------------------------
diff --cc
gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyAddEdgeTest.groovy
index 88fed56,f76692f..b3d5f49
---
a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyAddEdgeTest.groovy
+++
b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyAddEdgeTest.groovy
@@@ -48,7 -48,7 +48,7 @@@ public abstract class GroovyAddEdgeTes
@Override
public Traversal<Vertex, Edge>
get_g_V_asXaX_outXcreatedX_inXcreatedX_whereXneqXaXX_asXbX_addEXcodeveloperX_fromXaX_toXbX_propertyXyear_2009X()
{
- new ScriptTraversal<>(g, "gremlin-groovy",
"g.V.as('a').out('created').in('created').where(neq('a')).as('b').addE('co-developer').from('a').to('b').property('year',
2009)");
-
TraversalScriptHelper.compute("g.V.as('a').out('created').in('created').where(neq('a')).as('b').addE('codeveloper').from('a').to('b').property('year',
2009)", g)
++ new ScriptTraversal<>(g, "gremlin-groovy",
"g.V.as('a').out('created').in('created').where(neq('a')).as('b').addE('codeveloper').from('a').to('b').property('year',
2009)");
}
@Override
@@@ -74,7 -74,7 +74,7 @@@
@Override
public Traversal<Vertex, Edge>
get_g_V_asXaX_outXcreatedX_inXcreatedX_whereXneqXaXX_asXbX_selectXa_bX_addInEXa_codeveloper_b_year_2009X()
{
- new ScriptTraversal<>(g, "gremlin-groovy",
"g.V.as('a').out('created').in('created').where(neq('a')).as('b').select('a','b').addInE('a',
'co-developer', 'b', 'year', 2009)");
-
TraversalScriptHelper.compute("g.V.as('a').out('created').in('created').where(neq('a')).as('b').select('a','b').addInE('a',
'codeveloper', 'b', 'year', 2009)", g)
++ new ScriptTraversal<>(g, "gremlin-groovy",
"g.V.as('a').out('created').in('created').where(neq('a')).as('b').select('a','b').addInE('a',
'codeveloper', 'b', 'year', 2009)");
}
@Override
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/032536eb/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddEdgeTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/032536eb/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/PartitionStrategyProcessTest.java
----------------------------------------------------------------------
