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/12/04 21:33:03 UTC
git commit: ACCUMULO-1785 comment was messged up when resolving patch
conflict
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 <kt...@apache.org>
Authored: Wed Dec 4 15:29:57 2013 -0500
Committer: Keith Turner <kt...@apache.org>
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"