Return-Path: 
 <accumulo-commits-return-1349-apmail-incubator-accumulo-commits-archive=incubator.apache.org@incubator.apache.org>
X-Original-To: apmail-incubator-accumulo-commits-archive@minotaur.apache.org
Delivered-To: apmail-incubator-accumulo-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 55F789164
	for <apmail-incubator-accumulo-commits-archive@minotaur.apache.org>;
 Mon, 26 Mar 2012 12:17:33 +0000 (UTC)
Received: (qmail 53972 invoked by uid 500); 26 Mar 2012 12:17:33 -0000
Delivered-To: apmail-incubator-accumulo-commits-archive@incubator.apache.org
Received: (qmail 53953 invoked by uid 500); 26 Mar 2012 12:17:33 -0000
Mailing-List: contact accumulo-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:accumulo-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:accumulo-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:accumulo-commits@incubator.apache.org>
List-Id: <accumulo-commits.incubator.apache.org>
Reply-To: accumulo-dev@incubator.apache.org
Delivered-To: mailing list accumulo-commits@incubator.apache.org
Received: (qmail 53945 invoked by uid 99); 26 Mar 2012 12:17:33 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 26 Mar 2012 12:17:33 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 26 Mar 2012 12:17:31 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id B1C5D2388980;
	Mon, 26 Mar 2012 12:17:11 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1305329 - in /incubator/accumulo/branches/1.4: ./
 conf/examples/1GB/native-standalone/ conf/examples/1GB/standalone/
 conf/examples/2GB/native-standalone/ conf/examples/2GB/standalone/
 conf/examples/3GB/native-standalone/ conf/examples/3GB/...
Date: Mon, 26 Mar 2012 12:17:11 -0000
To: accumulo-commits@incubator.apache.org
From: ecn@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20120326121711.B1C5D2388980@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: ecn
Date: Mon Mar 26 12:17:10 2012
New Revision: 1305329

URL: http://svn.apache.org/viewvc?rev=1305329&view=rev
Log:
ACCUMULO-495 merge to 1.4 branch

Modified:
    incubator/accumulo/branches/1.4/   (props changed)
    incubator/accumulo/branches/1.4/conf/examples/1GB/native-standalone/accumulo-site.xml
    incubator/accumulo/branches/1.4/conf/examples/1GB/standalone/accumulo-site.xml
    incubator/accumulo/branches/1.4/conf/examples/2GB/native-standalone/accumulo-site.xml
    incubator/accumulo/branches/1.4/conf/examples/2GB/standalone/accumulo-site.xml
    incubator/accumulo/branches/1.4/conf/examples/3GB/native-standalone/accumulo-site.xml
    incubator/accumulo/branches/1.4/conf/examples/3GB/standalone/accumulo-site.xml
    incubator/accumulo/branches/1.4/src/core/   (props changed)
    incubator/accumulo/branches/1.4/src/server/   (props changed)

Propchange: incubator/accumulo/branches/1.4/
------------------------------------------------------------------------------
  Merged /incubator/accumulo/branches/1.4.0rc:r1305326

Modified: incubator/accumulo/branches/1.4/conf/examples/1GB/native-standalone/accumulo-site.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/conf/examples/1GB/native-standalone/accumulo-site.xml?rev=1305329&r1=1305328&r2=1305329&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/conf/examples/1GB/native-standalone/accumulo-site.xml (original)
+++ incubator/accumulo/branches/1.4/conf/examples/1GB/native-standalone/accumulo-site.xml Mon Mar 26 12:17:10 2012
@@ -84,7 +84,7 @@
 
     <property>
       <name>tserver.walog.max.size</name>
-      <value>100M</value>
+      <value>256M</value>
     </property>
 
     <property>

Modified: incubator/accumulo/branches/1.4/conf/examples/1GB/standalone/accumulo-site.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/conf/examples/1GB/standalone/accumulo-site.xml?rev=1305329&r1=1305328&r2=1305329&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/conf/examples/1GB/standalone/accumulo-site.xml (original)
+++ incubator/accumulo/branches/1.4/conf/examples/1GB/standalone/accumulo-site.xml Mon Mar 26 12:17:10 2012
@@ -84,7 +84,7 @@
     
     <property>
       <name>tserver.walog.max.size</name>
-      <value>100M</value>
+      <value>256M</value>
     </property>
 
     <property>

Modified: incubator/accumulo/branches/1.4/conf/examples/2GB/native-standalone/accumulo-site.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/conf/examples/2GB/native-standalone/accumulo-site.xml?rev=1305329&r1=1305328&r2=1305329&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/conf/examples/2GB/native-standalone/accumulo-site.xml (original)
+++ incubator/accumulo/branches/1.4/conf/examples/2GB/native-standalone/accumulo-site.xml Mon Mar 26 12:17:10 2012
@@ -79,7 +79,7 @@
 
     <property>
       <name>tserver.walog.max.size</name>
-      <value>100M</value>
+      <value>512M</value>
     </property>
 
     <property>

Modified: incubator/accumulo/branches/1.4/conf/examples/2GB/standalone/accumulo-site.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/conf/examples/2GB/standalone/accumulo-site.xml?rev=1305329&r1=1305328&r2=1305329&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/conf/examples/2GB/standalone/accumulo-site.xml (original)
+++ incubator/accumulo/branches/1.4/conf/examples/2GB/standalone/accumulo-site.xml Mon Mar 26 12:17:10 2012
@@ -79,7 +79,7 @@
     
     <property>
       <name>tserver.walog.max.size</name>
-      <value>100M</value>
+      <value>512M</value>
     </property>
 
     <property>

Modified: incubator/accumulo/branches/1.4/conf/examples/3GB/native-standalone/accumulo-site.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/conf/examples/3GB/native-standalone/accumulo-site.xml?rev=1305329&r1=1305328&r2=1305329&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/conf/examples/3GB/native-standalone/accumulo-site.xml (original)
+++ incubator/accumulo/branches/1.4/conf/examples/3GB/native-standalone/accumulo-site.xml Mon Mar 26 12:17:10 2012
@@ -78,11 +78,6 @@
     </property>
 
     <property>
-      <name>tserver.walog.max.size</name>
-      <value>100M</value>
-    </property>
-
-    <property>
       <name>general.classpaths</name>
       <value>
     $ACCUMULO_HOME/src/server/target/classes/,

Modified: incubator/accumulo/branches/1.4/conf/examples/3GB/standalone/accumulo-site.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/conf/examples/3GB/standalone/accumulo-site.xml?rev=1305329&r1=1305328&r2=1305329&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/conf/examples/3GB/standalone/accumulo-site.xml (original)
+++ incubator/accumulo/branches/1.4/conf/examples/3GB/standalone/accumulo-site.xml Mon Mar 26 12:17:10 2012
@@ -78,11 +78,6 @@
     </property>
 
     <property>
-      <name>tserver.walog.max.size</name>
-      <value>100M</value>
-    </property>
-
-    <property>
       <name>general.classpaths</name>
       <value>
     $ACCUMULO_HOME/src/server/target/classes/,

Propchange: incubator/accumulo/branches/1.4/src/core/
------------------------------------------------------------------------------
  Merged /incubator/accumulo/branches/1.4.0rc/src/core:r1305326

Propchange: incubator/accumulo/branches/1.4/src/server/
------------------------------------------------------------------------------
  Merged /incubator/accumulo/branches/1.4.0rc/src/server:r1305326