You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by kt...@apache.org on 2013/07/31 17:13:55 UTC
[18/50] [abbrv] git commit: ACCUMULO-847 merge back to 1.4 branch
ACCUMULO-847 merge back to 1.4 branch
git-svn-id: https://svn.apache.org/repos/asf/accumulo/branches/1.4@1485724 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/730e330e
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/730e330e
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/730e330e
Branch: refs/heads/master
Commit: 730e330e3d5305a2e831186e4876fe90a79ae72c
Parents: 49201bd
Author: Eric C. Newton <ec...@apache.org>
Authored: Thu May 23 14:19:14 2013 +0000
Committer: Eric C. Newton <ec...@apache.org>
Committed: Thu May 23 14:19:14 2013 +0000
----------------------------------------------------------------------
bin/config.sh | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/730e330e/bin/config.sh
----------------------------------------------------------------------
diff --git a/bin/config.sh b/bin/config.sh
index fc9db14..6a88e61 100755
--- a/bin/config.sh
+++ b/bin/config.sh
@@ -109,3 +109,6 @@ if [ ! -f "$ACCUMULO_HOME/conf/tracers" ]; then
echo "$MASTER1" > "$ACCUMULO_HOME/conf/tracers"
fi
SSH='ssh -qnf -o ConnectTimeout=2'
+
+# See HADOOP-7154 and ACCUMULO-847
+export MALLOC_ARENA_MAX=${MALLOC_ARENA_MAX:-1}