You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by ca...@apache.org on 2013/06/28 18:28:10 UTC
svn commit: r1497831 - in /zookeeper/branches/branch-3.4: CHANGES.txt bin/zkCleanup.sh bin/zkCli.sh bin/zkEnv.sh

Author: camille
Date: Fri Jun 28 16:28:09 2013
New Revision: 1497831

URL: http://svn.apache.org/r1497831
Log:
  ZOOKEEPER-1719. zkCli.sh, zkServer.sh and zkEnv.sh regression caused by ZOOKEEPER-1663
  (Marshall McMullen via camille)

Modified:
    zookeeper/branches/branch-3.4/CHANGES.txt
    zookeeper/branches/branch-3.4/bin/zkCleanup.sh
    zookeeper/branches/branch-3.4/bin/zkCli.sh
    zookeeper/branches/branch-3.4/bin/zkEnv.sh

Modified: zookeeper/branches/branch-3.4/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/CHANGES.txt?rev=1497831&r1=1497830&r2=1497831&view=diff
==============================================================================
--- zookeeper/branches/branch-3.4/CHANGES.txt (original)
+++ zookeeper/branches/branch-3.4/CHANGES.txt Fri Jun 28 16:28:09 2013
@@ -71,6 +71,10 @@ BUGFIXES:
 
   ZOOKEEPER-1714 perl client segfaults if ZOO_READ_ACL_UNSAFE constant is used
   (Botond Hejj via camille)
+  
+  ZOOKEEPER-1719. zkCli.sh, zkServer.sh and zkEnv.sh regression caused by ZOOKEEPER-1663
+  (Marshall McMullen via camille)
+  
 IMPROVEMENTS:
 
   ZOOKEEPER-1564. Allow JUnit test build with IBM Java

Modified: zookeeper/branches/branch-3.4/bin/zkCleanup.sh
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/bin/zkCleanup.sh?rev=1497831&r1=1497830&r2=1497831&view=diff
==============================================================================
--- zookeeper/branches/branch-3.4/bin/zkCleanup.sh (original)
+++ zookeeper/branches/branch-3.4/bin/zkCleanup.sh Fri Jun 28 16:28:09 2013
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with

Modified: zookeeper/branches/branch-3.4/bin/zkCli.sh
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/bin/zkCli.sh?rev=1497831&r1=1497830&r2=1497831&view=diff
==============================================================================
--- zookeeper/branches/branch-3.4/bin/zkCli.sh (original)
+++ zookeeper/branches/branch-3.4/bin/zkCli.sh Fri Jun 28 16:28:09 2013
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with

Modified: zookeeper/branches/branch-3.4/bin/zkEnv.sh
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/bin/zkEnv.sh?rev=1497831&r1=1497830&r2=1497831&view=diff
==============================================================================
--- zookeeper/branches/branch-3.4/bin/zkEnv.sh (original)
+++ zookeeper/branches/branch-3.4/bin/zkEnv.sh Fri Jun 28 16:28:09 2013
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with