Merge branch 'tp31' into tp32

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

Branch: refs/heads/master
Commit: f02fab9c6f6c7e8f05efc163c03ee9b3313253f0
Parents: d92dd5d 3d8c03b
Author: Daniel Kuppitz <daniel_kupp...@hotmail.com>
Authored: Mon Jul 31 18:02:27 2017 +0200
Committer: Daniel Kuppitz <daniel_kupp...@hotmail.com>
Committed: Mon Jul 31 18:02:27 2017 +0200

----------------------------------------------------------------------
 .../traversal/step/sideEffect/GroovySackTest.groovy     |  2 +-
 .../process/traversal/step/sideEffect/SackTest.java     | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f02fab9c/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovySackTest.groovy
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f02fab9c/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SackTest.java
----------------------------------------------------------------------
diff --cc 
gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SackTest.java
index 3bde60d,7903b07..7012478
--- 
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SackTest.java
+++ 
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SackTest.java
@@@ -69,11 -67,9 +69,11 @@@ public abstract class SackTest extends 
  
      public abstract Traversal<Vertex, Integer> 
get_g_withBulkXfalseX_withSackX1_sumX_V_out_barrier_sack();
  
 +    public abstract Traversal<Vertex, Double> 
get_g_withBulkXfalseX_withSackX1_sumX_VX1X_localXoutEXknowsX_barrierXnormSackX_inVX_inXknowsX_barrier_sack(final
 Object v1Id);
 +
      public abstract Traversal<Vertex, BigDecimal> 
get_g_withSackXBigInteger_TEN_powX1000X_assignX_V_localXoutXknowsX_barrierXnormSackXX_inXknowsX_barrier_sack();
  
-     public abstract Traversal<Vertex, BigDecimal> 
get_g_withSackX2X_V_sackXdivX_byXconstantXBigDecimal_valueOfX3XXX_sack();
+     public abstract Traversal<Vertex, Double> 
get_g_withSackX2X_V_sackXdivX_byXconstantX3_0XX_sack();
  
      @Test
      @LoadGraphWith(MODERN)

Reply via email to