accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject svn commit: r1485724 - in /accumulo/branches/1.4: ./ bin/ docs/src/user_manual/ src/ src/core/ src/server/ src/server/src/ src/server/src/main/java/org/apache/accumulo/server/test/functional/ src/server/src/main/java/org/apache/accumulo/server/zookeeper/
Date Thu, 23 May 2013 14:19:14 GMT
Author: ecn
Date: Thu May 23 14:19:14 2013
New Revision: 1485724

URL: http://svn.apache.org/r1485724
Log:
ACCUMULO-847 merge back to 1.4 branch

Modified:
    accumulo/branches/1.4/   (props changed)
    accumulo/branches/1.4/bin/config.sh
    accumulo/branches/1.4/docs/src/user_manual/   (props changed)
    accumulo/branches/1.4/src/   (props changed)
    accumulo/branches/1.4/src/core/   (props changed)
    accumulo/branches/1.4/src/server/   (props changed)
    accumulo/branches/1.4/src/server/src/   (props changed)
    accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/test/functional/
  (props changed)
    accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/zookeeper/ZooLock.java
  (props changed)

Propchange: accumulo/branches/1.4/
------------------------------------------------------------------------------
  Merged /accumulo/trunk:r1410010

Modified: accumulo/branches/1.4/bin/config.sh
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/bin/config.sh?rev=1485724&r1=1485723&r2=1485724&view=diff
==============================================================================
--- accumulo/branches/1.4/bin/config.sh (original)
+++ accumulo/branches/1.4/bin/config.sh Thu May 23 14:19:14 2013
@@ -109,3 +109,6 @@ if [ ! -f "$ACCUMULO_HOME/conf/tracers" 
     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}

Propchange: accumulo/branches/1.4/docs/src/user_manual/
------------------------------------------------------------------------------
  Merged /accumulo/trunk/docs/src/user_manual:r1410010

Propchange: accumulo/branches/1.4/src/
------------------------------------------------------------------------------
  Merged /accumulo/trunk/src:r1410010

Propchange: accumulo/branches/1.4/src/core/
------------------------------------------------------------------------------
  Merged /accumulo/trunk/src/core:r1410010

Propchange: accumulo/branches/1.4/src/server/
------------------------------------------------------------------------------
  Merged /accumulo/trunk/src/server:r1410010

Propchange: accumulo/branches/1.4/src/server/src/
------------------------------------------------------------------------------
  Merged /accumulo/trunk/src/server/src:r1410010

Propchange: accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/test/functional/
------------------------------------------------------------------------------
  Merged /accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/functional:r1410010

Propchange: accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/zookeeper/ZooLock.java
------------------------------------------------------------------------------
  Merged /accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/zookeeper/ZooLock.java:r1410010



Mime
View raw message