You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by ok...@apache.org on 2015/03/27 15:06:13 UTC
incubator-tinkerpop git commit: removed zookeeper.jar in resources as
it is no longer needed for testing with Giraph. Added DISCLAIMER.txt as
advised by the Incubator release process.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master 391c65683 -> dff3f2c6b
removed zookeeper.jar in resources as it is no longer needed for testing with Giraph. Added DISCLAIMER.txt as advised by the Incubator release process.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/dff3f2c6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/dff3f2c6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/dff3f2c6
Branch: refs/heads/master
Commit: dff3f2c6ba81c573c66d86b8e99d0a622f20a351
Parents: 391c656
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Fri Mar 27 08:05:58 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Fri Mar 27 08:06:09 2015 -0600
----------------------------------------------------------------------
DISCLAIMER.txt | 7 +++++++
.../gremlin/hadoop/HadoopGraphProvider.java | 1 -
.../process/computer/giraph/zookeeper-3.3.3.jar | Bin 601677 -> 0 bytes
3 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/dff3f2c6/DISCLAIMER.txt
----------------------------------------------------------------------
diff --git a/DISCLAIMER.txt b/DISCLAIMER.txt
new file mode 100644
index 0000000..390811b
--- /dev/null
+++ b/DISCLAIMER.txt
@@ -0,0 +1,7 @@
+Apache TinkerPop is an effort undergoing incubation at The Apache Software Foundation (ASF),
+sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until
+a further review indicates that the infrastructure, communications, and decision making process
+have stabilized in a manner consistent with other successful ASF projects. While incubation
+status is not necessarily a reflection of the completeness or stability of the code, it does
+indicate that the project has yet to be fully endorsed by the ASF. Apache TinkerPop is distributed
+under the Apache License v2.0.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/dff3f2c6/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/HadoopGraphProvider.java
----------------------------------------------------------------------
diff --git a/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/HadoopGraphProvider.java b/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/HadoopGraphProvider.java
index b84d09e..b8ba425 100644
--- a/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/HadoopGraphProvider.java
+++ b/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/HadoopGraphProvider.java
@@ -111,7 +111,6 @@ public class HadoopGraphProvider extends AbstractGraphProvider {
put(GiraphConstants.MIN_WORKERS, 1);
put(GiraphConstants.MAX_WORKERS, 1);
put(GiraphConstants.SPLIT_MASTER_WORKER.getKey(), false);
- put(GiraphConstants.ZOOKEEPER_JAR, GiraphGraphComputer.class.getResource("zookeeper-3.3.3.jar").getPath());
put(GiraphConstants.ZOOKEEPER_SERVER_PORT.getKey(), 2181); // you must have a local zookeeper running on this port
put(GiraphConstants.NETTY_SERVER_USE_EXECUTION_HANDLER.getKey(), false); // this prevents so many integration tests running out of threads
put(GiraphConstants.NETTY_CLIENT_USE_EXECUTION_HANDLER.getKey(), false); // this prevents so many integration tests running out of threads
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/dff3f2c6/hadoop-gremlin/src/test/resources/org/apache/tinkerpop/gremlin/hadoop/process/computer/giraph/zookeeper-3.3.3.jar
----------------------------------------------------------------------
diff --git a/hadoop-gremlin/src/test/resources/org/apache/tinkerpop/gremlin/hadoop/process/computer/giraph/zookeeper-3.3.3.jar b/hadoop-gremlin/src/test/resources/org/apache/tinkerpop/gremlin/hadoop/process/computer/giraph/zookeeper-3.3.3.jar
deleted file mode 100644
index d30bfd4..0000000
Binary files a/hadoop-gremlin/src/test/resources/org/apache/tinkerpop/gremlin/hadoop/process/computer/giraph/zookeeper-3.3.3.jar and /dev/null differ