Return-Path: X-Original-To: apmail-zookeeper-commits-archive@www.apache.org Delivered-To: apmail-zookeeper-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B10DA105D3 for ; Fri, 28 Jun 2013 16:28:31 +0000 (UTC) Received: (qmail 23457 invoked by uid 500); 28 Jun 2013 16:28:31 -0000 Delivered-To: apmail-zookeeper-commits-archive@zookeeper.apache.org Received: (qmail 23431 invoked by uid 500); 28 Jun 2013 16:28:30 -0000 Mailing-List: contact commits-help@zookeeper.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ Delivered-To: mailing list commits@zookeeper.apache.org Received: (qmail 23418 invoked by uid 99); 28 Jun 2013 16:28:30 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 28 Jun 2013 16:28:30 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 28 Jun 2013 16:28:29 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 5F6C32388900; Fri, 28 Jun 2013 16:28:10 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1497831 - in /zookeeper/branches/branch-3.4: CHANGES.txt bin/zkCleanup.sh bin/zkCli.sh bin/zkEnv.sh Date: Fri, 28 Jun 2013 16:28:10 -0000 To: commits@zookeeper.apache.org From: camille@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130628162810.5F6C32388900@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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