Author: ecn
Date: Mon Mar 26 12:18:47 2012
New Revision: 1305330
URL: http://svn.apache.org/viewvc?rev=1305330&view=rev
Log:
ACCUMULO-495 merge to trunk
Modified:
incubator/accumulo/trunk/ (props changed)
incubator/accumulo/trunk/conf/examples/1GB/native-standalone/accumulo-site.xml
incubator/accumulo/trunk/conf/examples/1GB/standalone/accumulo-site.xml
incubator/accumulo/trunk/conf/examples/2GB/native-standalone/accumulo-site.xml
incubator/accumulo/trunk/conf/examples/2GB/standalone/accumulo-site.xml
incubator/accumulo/trunk/conf/examples/3GB/native-standalone/accumulo-site.xml
incubator/accumulo/trunk/conf/examples/3GB/standalone/accumulo-site.xml
incubator/accumulo/trunk/core/ (props changed)
incubator/accumulo/trunk/server/ (props changed)
Propchange: incubator/accumulo/trunk/
------------------------------------------------------------------------------
Merged /incubator/accumulo/branches/1.4.0rc:r1305326
Merged /incubator/accumulo/branches/1.4:r1305329
Merged /incubator/accumulo/branches/1.4/src:r1305329
Modified:
incubator/accumulo/trunk/conf/examples/1GB/native-standalone/accumulo-site.xml
URL:
http://svn.apache.org/viewvc/incubator/accumulo/trunk/conf/examples/1GB/native-standalone/accumulo-site.xml?rev=1305330&r1=1305329&r2=1305330&view=diff
==============================================================================
---
incubator/accumulo/trunk/conf/examples/1GB/native-standalone/accumulo-site.xml
(original)
+++
incubator/accumulo/trunk/conf/examples/1GB/native-standalone/accumulo-site.xml
Mon Mar 26 12:18:47 2012
@@ -84,7 +84,7 @@
<property>
<name>tserver.walog.max.size</name>
- <value>100M</value>
+ <value>256M</value>
</property>
<property>
Modified:
incubator/accumulo/trunk/conf/examples/1GB/standalone/accumulo-site.xml
URL:
http://svn.apache.org/viewvc/incubator/accumulo/trunk/conf/examples/1GB/standalone/accumulo-site.xml?rev=1305330&r1=1305329&r2=1305330&view=diff
==============================================================================
--- incubator/accumulo/trunk/conf/examples/1GB/standalone/accumulo-site.xml
(original)
+++ incubator/accumulo/trunk/conf/examples/1GB/standalone/accumulo-site.xml Mon
Mar 26 12:18:47 2012
@@ -84,7 +84,7 @@
<property>
<name>tserver.walog.max.size</name>
- <value>100M</value>
+ <value>256M</value>
</property>
<property>
Modified:
incubator/accumulo/trunk/conf/examples/2GB/native-standalone/accumulo-site.xml
URL:
http://svn.apache.org/viewvc/incubator/accumulo/trunk/conf/examples/2GB/native-standalone/accumulo-site.xml?rev=1305330&r1=1305329&r2=1305330&view=diff
==============================================================================
---
incubator/accumulo/trunk/conf/examples/2GB/native-standalone/accumulo-site.xml
(original)
+++
incubator/accumulo/trunk/conf/examples/2GB/native-standalone/accumulo-site.xml
Mon Mar 26 12:18:47 2012
@@ -79,7 +79,7 @@
<property>
<name>tserver.walog.max.size</name>
- <value>100M</value>
+ <value>512M</value>
</property>
<property>
Modified:
incubator/accumulo/trunk/conf/examples/2GB/standalone/accumulo-site.xml
URL:
http://svn.apache.org/viewvc/incubator/accumulo/trunk/conf/examples/2GB/standalone/accumulo-site.xml?rev=1305330&r1=1305329&r2=1305330&view=diff
==============================================================================
--- incubator/accumulo/trunk/conf/examples/2GB/standalone/accumulo-site.xml
(original)
+++ incubator/accumulo/trunk/conf/examples/2GB/standalone/accumulo-site.xml Mon
Mar 26 12:18:47 2012
@@ -79,7 +79,7 @@
<property>
<name>tserver.walog.max.size</name>
- <value>100M</value>
+ <value>512M</value>
</property>
<property>
Modified:
incubator/accumulo/trunk/conf/examples/3GB/native-standalone/accumulo-site.xml
URL:
http://svn.apache.org/viewvc/incubator/accumulo/trunk/conf/examples/3GB/native-standalone/accumulo-site.xml?rev=1305330&r1=1305329&r2=1305330&view=diff
==============================================================================
---
incubator/accumulo/trunk/conf/examples/3GB/native-standalone/accumulo-site.xml
(original)
+++
incubator/accumulo/trunk/conf/examples/3GB/native-standalone/accumulo-site.xml
Mon Mar 26 12:18:47 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/server/target/classes/,
Modified:
incubator/accumulo/trunk/conf/examples/3GB/standalone/accumulo-site.xml
URL:
http://svn.apache.org/viewvc/incubator/accumulo/trunk/conf/examples/3GB/standalone/accumulo-site.xml?rev=1305330&r1=1305329&r2=1305330&view=diff
==============================================================================
--- incubator/accumulo/trunk/conf/examples/3GB/standalone/accumulo-site.xml
(original)
+++ incubator/accumulo/trunk/conf/examples/3GB/standalone/accumulo-site.xml Mon
Mar 26 12:18:47 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/server/target/classes/,
Propchange: incubator/accumulo/trunk/core/
------------------------------------------------------------------------------
svn:mergeinfo = /incubator/accumulo/branches/1.4.0rc/src/core:1305326
Propchange: incubator/accumulo/trunk/server/
------------------------------------------------------------------------------
svn:mergeinfo = /incubator/accumulo/branches/1.4.0rc/src/server:1305326
