Author: ecn
Date: Thu Mar 15 16:29:06 2012
New Revision: 1301071
URL: http://svn.apache.org/viewvc?rev=1301071&view=rev
Log:
ACCUMULO-390 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/conf/examples/512MB/native-standalone/accumulo-site.xml
incubator/accumulo/trunk/conf/examples/512MB/standalone/accumulo-site.xml
Propchange: incubator/accumulo/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 15 16:29:06 2012
@@ -1,3 +1,3 @@
/incubator/accumulo/branches/1.3:1190280,1190413,1190420,1190427,1190500,1195622,1195625,1195629,1195635,1196044,1196054,1196057,1196071-1196072,1196106,1197066,1198935,1199383,1203683,1204625,1205547,1205880,1206169,1208031,1209124,1209526,1209532,1209539,1209541,1209587,1209657,1210518,1210571,1210596,1210598,1213424,1214320,1225006,1227215,1227231,1227611,1228195,1230180,1230736,1231043,1236873,1245632
/incubator/accumulo/branches/1.3.5rc:1209938
-/incubator/accumulo/branches/1.4:1201902-1300181
+/incubator/accumulo/branches/1.4:1201902-1300181,1301056
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=1301071&r1=1301070&r2=1301071&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
Thu Mar 15 16:29:06 2012
@@ -76,7 +76,22 @@
<name>trace.user</name>
<value>root</value>
</property>
-
+
+ <property>
+ <name>logger.sort.buffer.size</name>
+ <value>50M</value>
+ </property>
+
+ <property>
+ <name>tserver.walog.max.size</name>
+ <value>100M</value>
+ </property>
+
+ <property>
+ <name>tserver.walog.max.size</name>
+ <value>100M</value>
+ </property>
+
<property>
<name>general.classpaths</name>
<value>
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=1301071&r1=1301070&r2=1301071&view=diff
==============================================================================
--- incubator/accumulo/trunk/conf/examples/1GB/standalone/accumulo-site.xml
(original)
+++ incubator/accumulo/trunk/conf/examples/1GB/standalone/accumulo-site.xml Thu
Mar 15 16:29:06 2012
@@ -73,11 +73,21 @@
</property>
<property>
+ <name>logger.sort.buffer.size</name>
+ <value>50M</value>
+ </property>
+
+ <property>
<name>trace.user</name>
<value>root</value>
</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/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=1301071&r1=1301070&r2=1301071&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
Thu Mar 15 16:29:06 2012
@@ -76,7 +76,12 @@
<name>trace.user</name>
<value>root</value>
</property>
-
+
+ <property>
+ <name>tserver.walog.max.size</name>
+ <value>100M</value>
+ </property>
+
<property>
<name>general.classpaths</name>
<value>
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=1301071&r1=1301070&r2=1301071&view=diff
==============================================================================
--- incubator/accumulo/trunk/conf/examples/2GB/standalone/accumulo-site.xml
(original)
+++ incubator/accumulo/trunk/conf/examples/2GB/standalone/accumulo-site.xml Thu
Mar 15 16:29:06 2012
@@ -78,6 +78,11 @@
</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/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=1301071&r1=1301070&r2=1301071&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
Thu Mar 15 16:29:06 2012
@@ -76,7 +76,12 @@
<name>trace.user</name>
<value>root</value>
</property>
-
+
+ <property>
+ <name>tserver.walog.max.size</name>
+ <value>100M</value>
+ </property>
+
<property>
<name>general.classpaths</name>
<value>
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=1301071&r1=1301070&r2=1301071&view=diff
==============================================================================
--- incubator/accumulo/trunk/conf/examples/3GB/standalone/accumulo-site.xml
(original)
+++ incubator/accumulo/trunk/conf/examples/3GB/standalone/accumulo-site.xml Thu
Mar 15 16:29:06 2012
@@ -76,7 +76,12 @@
<name>trace.user</name>
<value>root</value>
</property>
-
+
+ <property>
+ <name>tserver.walog.max.size</name>
+ <value>100M</value>
+ </property>
+
<property>
<name>general.classpaths</name>
<value>
Modified:
incubator/accumulo/trunk/conf/examples/512MB/native-standalone/accumulo-site.xml
URL:
http://svn.apache.org/viewvc/incubator/accumulo/trunk/conf/examples/512MB/native-standalone/accumulo-site.xml?rev=1301071&r1=1301070&r2=1301071&view=diff
==============================================================================
---
incubator/accumulo/trunk/conf/examples/512MB/native-standalone/accumulo-site.xml
(original)
+++
incubator/accumulo/trunk/conf/examples/512MB/native-standalone/accumulo-site.xml
Thu Mar 15 16:29:06 2012
@@ -76,7 +76,17 @@
<name>trace.user</name>
<value>root</value>
</property>
-
+
+ <property>
+ <name>logger.sort.buffer.size</name>
+ <value>50M</value>
+ </property>
+
+ <property>
+ <name>tserver.walog.max.size</name>
+ <value>100M</value>
+ </property>
+
<property>
<name>general.classpaths</name>
<value>
Modified:
incubator/accumulo/trunk/conf/examples/512MB/standalone/accumulo-site.xml
URL:
http://svn.apache.org/viewvc/incubator/accumulo/trunk/conf/examples/512MB/standalone/accumulo-site.xml?rev=1301071&r1=1301070&r2=1301071&view=diff
==============================================================================
--- incubator/accumulo/trunk/conf/examples/512MB/standalone/accumulo-site.xml
(original)
+++ incubator/accumulo/trunk/conf/examples/512MB/standalone/accumulo-site.xml
Thu Mar 15 16:29:06 2012
@@ -81,7 +81,12 @@
<name>logger.sort.buffer.size</name>
<value>50M</value>
</property>
-
+
+ <property>
+ <name>tserver.walog.max.size</name>
+ <value>100M</value>
+ </property>
+
<property>
<name>general.classpaths</name>
<value>
