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 62DBE106F4 for ; Tue, 1 Oct 2013 21:31:05 +0000 (UTC) Received: (qmail 77134 invoked by uid 500); 1 Oct 2013 21:31:05 -0000 Delivered-To: apmail-zookeeper-commits-archive@zookeeper.apache.org Received: (qmail 77114 invoked by uid 500); 1 Oct 2013 21:31:05 -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 77102 invoked by uid 99); 1 Oct 2013 21:31:04 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Oct 2013 21:31:04 +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; Tue, 01 Oct 2013 21:31:03 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 2EB95238883D; Tue, 1 Oct 2013 21:30:43 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1528221 - in /zookeeper/branches/branch-3.4: CHANGES.txt bin/zkEnv.sh Date: Tue, 01 Oct 2013 21:30:43 -0000 To: commits@zookeeper.apache.org From: fpj@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20131001213043.2EB95238883D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: fpj Date: Tue Oct 1 21:30:42 2013 New Revision: 1528221 URL: http://svn.apache.org/r1528221 Log: ZOOKEEPER-1670. zookeeper should set a default value for SERVER_JVMFLAGS and CLIENT_JVMFLAGS so that memory usage is controlled (reverted) Modified: zookeeper/branches/branch-3.4/CHANGES.txt 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=1528221&r1=1528220&r2=1528221&view=diff ============================================================================== --- zookeeper/branches/branch-3.4/CHANGES.txt (original) +++ zookeeper/branches/branch-3.4/CHANGES.txt Tue Oct 1 21:30:42 2013 @@ -88,8 +88,6 @@ BUGFIXES: ZOOKEEPER-1379. 'printwatches, redo, history and connect '. client commands always print usage. This is not necessary (edward via fpj) - ZOOKEEPER-1670: zookeeper should set a default value for SERVER_JVMFLAGS and CLIENT_JVMFLAGS so that memory usage is controlled (Arpit Gupta via fpj) - ZOOKEEPER-1448: Node+Quota creation in transaction log can crash leader startup (Botond Hejj via fpj) ZOOKEEPER-1664. Kerberos auth doesn't work with native platform GSS integration. (Boaz Kelmer via camille) Modified: zookeeper/branches/branch-3.4/bin/zkEnv.sh URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/bin/zkEnv.sh?rev=1528221&r1=1528220&r2=1528221&view=diff ============================================================================== --- zookeeper/branches/branch-3.4/bin/zkEnv.sh (original) +++ zookeeper/branches/branch-3.4/bin/zkEnv.sh Tue Oct 1 21:30:42 2013 @@ -112,12 +112,4 @@ then CLASSPATH=`cygpath -wp "$CLASSPATH"` fi -#echo "CLASSPATH=$CLASSPATH" - -# default heap for zookeeper server -ZK_SERVER_HEAP="${ZK_SERVER_HEAP:-1000}" -export SERVER_JVMFLAGS="-Xmx${ZK_SERVER_HEAP}m $SERVER_JVMFLAGS" - -# default heap for zookeeper client -ZK_CLIENT_HEAP="${ZK_CLIENT_HEAP:-256}" -export CLIENT_JVMFLAGS="-Xmx${ZK_CLIENT_HEAP}m $CLIENT_JVMFLAGS" +#echo "CLASSPATH=$CLASSPATH" \ No newline at end of file