accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject accumulo git commit: ACCUMULO-2916 Update docs related to ZooKeeper version
Date Wed, 19 Nov 2014 19:03:52 GMT
Repository: accumulo
Updated Branches:
  refs/heads/master 4af9f85d4 -> c51d424b9


ACCUMULO-2916 Update docs related to ZooKeeper version


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

Branch: refs/heads/master
Commit: c51d424b930b13e4bcc39bed1d0b687b769fc1c6
Parents: 4af9f85
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Wed Nov 19 14:03:23 2014 -0500
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Wed Nov 19 14:03:23 2014 -0500

----------------------------------------------------------------------
 assemble/bin/start-all.sh                   | 4 ++--
 docs/src/main/asciidoc/chapters/clients.txt | 2 +-
 pom.xml                                     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/c51d424b/assemble/bin/start-all.sh
----------------------------------------------------------------------
diff --git a/assemble/bin/start-all.sh b/assemble/bin/start-all.sh
index cebbd8c..b69bc0e 100755
--- a/assemble/bin/start-all.sh
+++ b/assemble/bin/start-all.sh
@@ -53,8 +53,8 @@ fi
 ZOOKEEPER_VERSION=${ZOOKEEPER_VERSION##$ZOOKEEPER_HOME/zookeeper-}
 ZOOKEEPER_VERSION=${ZOOKEEPER_VERSION%%.jar}
 
-if [ "$ZOOKEEPER_VERSION" '<' "3.3.0" ]; then
-   echo "WARN : Using Zookeeper $ZOOKEEPER_VERSION.  Use version 3.3.0 or greater to avoid
zookeeper deadlock bug.";
+if [ "$ZOOKEEPER_VERSION" '<' "3.4.0" ]; then
+   echo "WARN : Using Zookeeper $ZOOKEEPER_VERSION.  Use version 3.4.0 or greater. Older
versions may not work reliably.";
 fi
 
 ${bin}/start-server.sh $MONITOR monitor 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/c51d424b/docs/src/main/asciidoc/chapters/clients.txt
----------------------------------------------------------------------
diff --git a/docs/src/main/asciidoc/chapters/clients.txt b/docs/src/main/asciidoc/chapters/clients.txt
index a0c74a5..64f0e55 100644
--- a/docs/src/main/asciidoc/chapters/clients.txt
+++ b/docs/src/main/asciidoc/chapters/clients.txt
@@ -28,7 +28,7 @@ In order to run client code written to run against Accumulo, you will need
to
 include the jars that Accumulo depends on in your classpath. Accumulo client
 code depends on Hadoop and Zookeeper. For Hadoop add the hadoop client jar, all
 of the jars in the Hadoop lib directory, and the conf directory to the
-classpath. For Zookeeper 3.3 you only need to add the Zookeeper jar, and not
+classpath. For recent Zookeeper versions, you only need to add the Zookeeper jar, and not
 what is in the Zookeeper lib directory. You can run the following command on a
 configured Accumulo system to see what its using for its classpath.
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/c51d424b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index e9338f4..9e62389 100644
--- a/pom.xml
+++ b/pom.xml
@@ -139,7 +139,7 @@
     <slf4j.version>1.7.5</slf4j.version>
     <!-- Thrift version -->
     <thrift.version>0.9.1</thrift.version>
-    <!-- ZooKeeper 3.4.x works also, but we're not using new features yet; this ensures
3.3.x compatibility. -->
+    <!-- ZooKeeper version -->
     <zookeeper.version>3.4.6</zookeeper.version>
   </properties>
   <dependencyManagement>


Mime
View raw message