Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-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 B5079100D6 for ; Wed, 4 Dec 2013 20:33:03 +0000 (UTC) Received: (qmail 2759 invoked by uid 500); 4 Dec 2013 20:33:03 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 2716 invoked by uid 500); 4 Dec 2013 20:33:03 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 2709 invoked by uid 99); 4 Dec 2013 20:33:03 -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, 04 Dec 2013 20:33:03 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 51E3CBCC4; Wed, 4 Dec 2013 20:33:03 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: kturner@apache.org To: commits@accumulo.apache.org Message-Id: <452816353d714d1c84f65e7671f95e58@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: ACCUMULO-1785 comment was messged up when resolving patch conflict Date: Wed, 4 Dec 2013 20:33:03 +0000 (UTC) Updated Branches: refs/heads/1.4.5-SNAPSHOT a7d981b37 -> b6931683a ACCUMULO-1785 comment was messged up when resolving patch conflict Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b6931683 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b6931683 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b6931683 Branch: refs/heads/1.4.5-SNAPSHOT Commit: b6931683a5bab1bfba9498c83451bb3daf0a8c25 Parents: a7d981b Author: Keith Turner Authored: Wed Dec 4 15:29:57 2013 -0500 Committer: Keith Turner Committed: Wed Dec 4 15:32:32 2013 -0500 ---------------------------------------------------------------------- bin/config.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/b6931683/bin/config.sh ---------------------------------------------------------------------- diff --git a/bin/config.sh b/bin/config.sh index 0165a2d..89685fb 100755 --- a/bin/config.sh +++ b/bin/config.sh @@ -28,9 +28,6 @@ # HADOOP_HOME Home dir for hadoop. # MONITOR Machine to run monitor daemon on. Used by start-here.sh script # -# Values always set by script. -# MALLOC_ARENA_MAX To work around a memory management bug (see ACCUMULO-847) -# # Iff ACCUMULO_VERIFY_ONLY is not set, this script will # * Check for standalone mode (lack of masters and slaves files) # - Do appropriate set up @@ -39,6 +36,7 @@ # # Values always set by script. # SSH Default ssh parameters used to start daemons +# MALLOC_ARENA_MAX To work around a memory management bug (see ACCUMULO-847) if [ -z "${ACCUMULO_HOME}" ] ; then this="$0"