[SCM] Apache ZooKeeper branch, master, updated. debian/3.3.4+dfsg1-2-6-g048e0be

[James Page]

The following commit has been merged in the master branch:
commit 048e0beb0349f96e932fb7838758d7c5537e6a22
Author: James Page <james.page at ubuntu.com>
Date:   Fri Mar 2 11:18:38 2012 +0000

    Fix issue with quoting of parameters in zkCli.sh (Closes: #661837):
    
    * Fix issue with quoting of parameters in zkCli.sh (Closes: #661837):
      - d/patches/fixes/ZOOKEEPER-1403: Ensure parameters are correctly
        quoted - thanks to John Eikenberry for this fix.

diff --git a/debian/changelog b/debian/changelog
index 4cdb31f..da74532 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+zookeeper (3.3.4+dfsg1-4) UNRELEASED; urgency=low
+
+  * Fix issue with quoting of parameters in zkCli.sh (Closes: #661837):
+    - d/patches/fixes/ZOOKEEPER-1403: Ensure parameters are correctly
+      quoted - thanks to John Eikenberry for this fix.
+
+ -- James Page <james.page at ubuntu.com>  Fri, 02 Mar 2012 11:15:45 +0000
+
 zookeeper (3.3.4+dfsg1-3) unstable; urgency=low
 
   * Sync changes from Ubuntu:
diff --git a/debian/patches/fixes/ZOOKEEPER-1403 b/debian/patches/fixes/ZOOKEEPER-1403
new file mode 100644
index 0000000..9de78e9
--- /dev/null
+++ b/debian/patches/fixes/ZOOKEEPER-1403
@@ -0,0 +1,15 @@
+Description: Ensure that parameters to zkCli.sh are correctly
+ passed to the supporting Java code.
+Author: John Eikenberry <jae at zhar.net>
+Bug: https://issues.apache.org/jira/browse/ZOOKEEPER-1403
+
+Index: zookeeper/bin/zkCli.sh
+===================================================================
+--- zookeeper.orig/bin/zkCli.sh	2012-01-03 10:21:37.000000000 +0000
++++ zookeeper/bin/zkCli.sh	2012-03-02 11:13:34.076917800 +0000
+@@ -38,4 +38,4 @@
+ 
+ $JAVA "-Dzookeeper.log.dir=${ZOO_LOG_DIR}" "-Dzookeeper.root.logger=${ZOO_LOG4J_PROP}" \
+      -cp "$CLASSPATH" $CLIENT_JVMFLAGS $JVMFLAGS \
+-     org.apache.zookeeper.ZooKeeperMain $@
++     org.apache.zookeeper.ZooKeeperMain "$@"
diff --git a/debian/patches/series b/debian/patches/series
index 1e279d4..f49a570 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ fixes/ZOOKEEPER-705
 fixes/ZOOKEEPER-1033
 fix-broken-c-client-unittest.patch
 fixes/ZOOKEEPER-1374
+fixes/ZOOKEEPER-1403

-- 
Apache ZooKeeper