Merge branch '1.6' into 1.7
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7d063162 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7d063162 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7d063162 Branch: refs/heads/1.7 Commit: 7d063162c53acf81dae793727c3a2b29336f4cc3 Parents: 422815a b040557 Author: Christopher Tubbs <ctubb...@apache.org> Authored: Thu Mar 24 18:37:39 2016 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Thu Mar 24 18:37:39 2016 -0400 ---------------------------------------------------------------------- assemble/bin/start-all.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/7d063162/assemble/bin/start-all.sh ---------------------------------------------------------------------- diff --cc assemble/bin/start-all.sh index a4596db,445e046..b670743 --- a/assemble/bin/start-all.sh +++ b/assemble/bin/start-all.sh @@@ -51,11 -50,10 +51,10 @@@ if [ -z "$ZOOKEEPER_VERSION" ]; the echo "Please check ZOOKEEPER_HOME, either globally or in accumulo-env.sh." exit 1 fi - ZOOKEEPER_VERSION=${ZOOKEEPER_VERSION##$ZOOKEEPER_HOME/zookeeper-} - ZOOKEEPER_VERSION=${ZOOKEEPER_VERSION%%.jar} + ZOOKEEPER_VERSION=$(basename "${ZOOKEEPER_VERSION##*-}" .jar) - if [ "$ZOOKEEPER_VERSION" '<' "3.4.0" ]; then -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
