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 2018/03/22 13:13:57 UTC

[1/2] tinkerpop git commit: Fixed bad label in test for sink data

Repository: tinkerpop
Updated Branches:
  refs/heads/tp33 da8588b9c -> 58691c684


Fixed bad label in test for sink data

Not sure why all test implementations weren't failing here, but giraph was especially not happy. CTR


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

Branch: refs/heads/tp33
Commit: 373eba1428f989743cab050fd253c26c36f922f0
Parents: bddc756
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Mar 22 09:12:03 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Mar 22 09:12:27 2018 -0400

----------------------------------------------------------------------
 .../tinkerpop/gremlin/process/computer/GraphComputerTest.java      | 2 +-
 .../tinkerpop/gremlin/tinkergraph/structure/TinkerFactory.java     | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/373eba14/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
index f9e79ae..3f492d6 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
@@ -2758,7 +2758,7 @@ public class GraphComputerTest extends AbstractGremlinProcessTest {
         private static final String SIMPLE_VERTEX_PROGRAM_CFG_PREFIX = "gremlin.simpleVertexProgram";
         private static final String PROPERTY_OUT = "propertyout";
         private static final String PROPERTY_IN = "name";
-        private static final String VERTEX_LABEL = "message_passing_test";
+        private static final String VERTEX_LABEL = "message";
         private static final String DIRECTION_CFG_KEY = SIMPLE_VERTEX_PROGRAM_CFG_PREFIX + ".direction";
 
         private Direction direction;

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/373eba14/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerFactory.java
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerFactory.java b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerFactory.java
index c464fa8..ef1ee7f 100644
--- a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerFactory.java
+++ b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerFactory.java
@@ -21,7 +21,6 @@ package org.apache.tinkerpop.gremlin.tinkergraph.structure;
 import org.apache.commons.configuration.BaseConfiguration;
 import org.apache.commons.configuration.Configuration;
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
-import org.apache.tinkerpop.gremlin.structure.Graph;
 import org.apache.tinkerpop.gremlin.structure.T;
 import org.apache.tinkerpop.gremlin.structure.Vertex;
 import org.apache.tinkerpop.gremlin.structure.VertexProperty;


[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Posted by sp...@apache.org.
Merge branch 'tp32' into tp33


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

Branch: refs/heads/tp33
Commit: 58691c684f29707699e0111f52d38bc8cbfedc48
Parents: da8588b 373eba1
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Mar 22 09:13:23 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Mar 22 09:13:23 2018 -0400

----------------------------------------------------------------------
 .../tinkerpop/gremlin/process/computer/GraphComputerTest.java      | 2 +-
 .../tinkerpop/gremlin/tinkergraph/structure/TinkerFactory.java     | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/58691c68/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
----------------------------------------------------------------------