Return-Path: X-Original-To: apmail-hbase-commits-archive@www.apache.org Delivered-To: apmail-hbase-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 8AF6C17ED0 for ; Wed, 1 Oct 2014 20:40:02 +0000 (UTC) Received: (qmail 18276 invoked by uid 500); 1 Oct 2014 20:40:02 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 18231 invoked by uid 500); 1 Oct 2014 20:40:02 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 18222 invoked by uid 99); 1 Oct 2014 20:40:02 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Oct 2014 20:40:02 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id F19F69C3101; Wed, 1 Oct 2014 20:40:01 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: eclark@apache.org To: commits@hbase.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: HBASE-11804 Raise default heap size if unspecified Date: Wed, 1 Oct 2014 20:40:01 +0000 (UTC) Repository: hbase Updated Branches: refs/heads/master ed441ad81 -> 915b33863 HBASE-11804 Raise default heap size if unspecified Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/915b3386 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/915b3386 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/915b3386 Branch: refs/heads/master Commit: 915b338634f9e538c8b3cf1ae74019fbfa4b636f Parents: ed441ad Author: Elliott Clark Authored: Thu Sep 25 19:40:07 2014 -0700 Committer: Elliott Clark Committed: Wed Oct 1 13:39:52 2014 -0700 ---------------------------------------------------------------------- bin/hbase | 1 - 1 file changed, 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/915b3386/bin/hbase ---------------------------------------------------------------------- diff --git a/bin/hbase b/bin/hbase index 41620f0..8678eb8 100755 --- a/bin/hbase +++ b/bin/hbase @@ -108,7 +108,6 @@ COMMAND=$1 shift JAVA=$JAVA_HOME/bin/java -JAVA_HEAP_MAX=-Xmx1000m # override default settings for this command, if applicable if [ -f "$HBASE_HOME/conf/hbase-env-$COMMAND.sh" ]; then