You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by bi...@apache.org on 2012/03/02 23:45:40 UTC
svn commit: r1296504 - in /incubator/accumulo/trunk: ./ bin/ conf/
docs/examples/ docs/src/user_manual/ docs/src/user_manual/appendices/
src/assemble/ src/core/
src/core/src/main/java/org/apache/accumulo/core/iterators/user/
src/core/src/main/thrift/ s...
Author: billie
Date: Fri Mar 2 22:45:37 2012
New Revision: 1296504
URL: http://svn.apache.org/viewvc?rev=1296504&view=rev
Log:
ACCUMULO-145 ACCUMULO-405 merged to trunk
Modified:
incubator/accumulo/trunk/ (props changed)
incubator/accumulo/trunk/.gitignore (props changed)
incubator/accumulo/trunk/bin/LogForwarder.sh (props changed)
incubator/accumulo/trunk/bin/accumulo (props changed)
incubator/accumulo/trunk/bin/check-slaves (props changed)
incubator/accumulo/trunk/bin/config.sh (props changed)
incubator/accumulo/trunk/bin/etc_initd_accumulo (props changed)
incubator/accumulo/trunk/bin/start-all.sh (props changed)
incubator/accumulo/trunk/bin/start-here.sh (props changed)
incubator/accumulo/trunk/bin/start-server.sh (props changed)
incubator/accumulo/trunk/bin/stop-all.sh (props changed)
incubator/accumulo/trunk/bin/stop-here.sh (props changed)
incubator/accumulo/trunk/bin/stop-server.sh (props changed)
incubator/accumulo/trunk/bin/tdown.sh (props changed)
incubator/accumulo/trunk/bin/tool.sh (props changed)
incubator/accumulo/trunk/bin/tup.sh (props changed)
incubator/accumulo/trunk/conf/accumulo-env.sh.1GBstandalone-default-example (props changed)
incubator/accumulo/trunk/conf/accumulo-env.sh.1GBstandalone-native-example (props changed)
incubator/accumulo/trunk/conf/accumulo-env.sh.2GBstandalone-default-example (props changed)
incubator/accumulo/trunk/conf/accumulo-env.sh.2GBstandalone-native-example (props changed)
incubator/accumulo/trunk/conf/accumulo-env.sh.3GBcluster-default-example (props changed)
incubator/accumulo/trunk/conf/accumulo-env.sh.3GBcluster-native-example (props changed)
incubator/accumulo/trunk/conf/accumulo-env.sh.512MBBstandalone-default-example (props changed)
incubator/accumulo/trunk/conf/accumulo-env.sh.512MBBstandalone-native-example (props changed)
incubator/accumulo/trunk/conf/accumulo-site.xml.1GBstandalone-example (props changed)
incubator/accumulo/trunk/conf/accumulo-site.xml.2GBstandalone-example (props changed)
incubator/accumulo/trunk/conf/accumulo-site.xml.3GBcluster-example (props changed)
incubator/accumulo/trunk/conf/accumulo-site.xml.512MBBstandalone-example (props changed)
incubator/accumulo/trunk/docs/examples/README.bulkIngest
incubator/accumulo/trunk/docs/examples/README.isolation (props changed)
incubator/accumulo/trunk/docs/examples/README.visibility (props changed)
incubator/accumulo/trunk/docs/src/user_manual/appendices/get_shell_commands.sh (props changed)
incubator/accumulo/trunk/docs/src/user_manual/build.sh (props changed)
incubator/accumulo/trunk/src/assemble/build.sh (props changed)
incubator/accumulo/trunk/src/assemble/docgen.sh (props changed)
incubator/accumulo/trunk/src/core/ (props changed)
incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/user/RowFilter.java (props changed)
incubator/accumulo/trunk/src/core/src/main/thrift/thrift.sh (props changed)
incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/iterators/user/RowFilterTest.java (props changed)
incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/helloworld/InsertWithBatchWriter.java
incubator/accumulo/trunk/src/examples/wikisearch/README.parallel (props changed)
incubator/accumulo/trunk/src/examples/wikisearch/ingest/conf/wikipedia_parallel.xml.example (props changed)
incubator/accumulo/trunk/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/output/BufferingRFileRecordWriter.java (props changed)
incubator/accumulo/trunk/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/output/SortingRFileOutputFormat.java (props changed)
incubator/accumulo/trunk/src/examples/wikisearch/ingest/src/main/protobuf/TermWeight.proto (props changed)
incubator/accumulo/trunk/src/examples/wikisearch/ingest/src/main/protobuf/Uid.proto (props changed)
incubator/accumulo/trunk/src/packages/deb/accumulo-custom-conf/control (props changed)
incubator/accumulo/trunk/src/packages/deb/accumulo-gc/control (props changed)
incubator/accumulo/trunk/src/packages/deb/accumulo-logger/control (props changed)
incubator/accumulo/trunk/src/packages/deb/accumulo-master/control (props changed)
incubator/accumulo/trunk/src/packages/deb/accumulo-monitor/control (props changed)
incubator/accumulo/trunk/src/packages/deb/accumulo-native/control (props changed)
incubator/accumulo/trunk/src/packages/deb/accumulo-native/postinst (props changed)
incubator/accumulo/trunk/src/packages/deb/accumulo-native/postrm (props changed)
incubator/accumulo/trunk/src/packages/deb/accumulo-single-conf/control (props changed)
incubator/accumulo/trunk/src/packages/deb/accumulo-singleton/control (props changed)
incubator/accumulo/trunk/src/packages/deb/accumulo-slave/control (props changed)
incubator/accumulo/trunk/src/packages/deb/accumulo-test/control (props changed)
incubator/accumulo/trunk/src/packages/deb/accumulo-tserver/control (props changed)
incubator/accumulo/trunk/src/packages/deb/accumulo/conffile (props changed)
incubator/accumulo/trunk/src/packages/deb/accumulo/control (props changed)
incubator/accumulo/trunk/src/packages/deb/accumulo/postinst (props changed)
incubator/accumulo/trunk/src/packages/deb/accumulo/postrm (props changed)
incubator/accumulo/trunk/src/server/ (props changed)
incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/fate/Admin.java (props changed)
incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilter.java (props changed)
incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/functional/MergeTest.java (props changed)
incubator/accumulo/trunk/src/start/src/test/shell/makeTestJars.sh (props changed)
incubator/accumulo/trunk/src/trace/thrift.sh (props changed)
incubator/accumulo/trunk/test/system/auto/pkill.sh (props changed)
incubator/accumulo/trunk/test/system/bench/lib/Benchmark.py
incubator/accumulo/trunk/test/system/continuous/analyze-missing.sh (props changed)
incubator/accumulo/trunk/test/system/continuous/mapred-setup.sh (props changed)
incubator/accumulo/trunk/test/system/continuous/run-moru.sh (props changed)
incubator/accumulo/trunk/test/system/continuous/run-verify.sh (props changed)
incubator/accumulo/trunk/test/system/continuous/start-agitator.sh (props changed)
incubator/accumulo/trunk/test/system/continuous/start-batchwalkers.sh (props changed)
incubator/accumulo/trunk/test/system/continuous/start-ingest.sh (props changed)
incubator/accumulo/trunk/test/system/continuous/start-scanners.sh (props changed)
incubator/accumulo/trunk/test/system/continuous/start-stats.sh (props changed)
incubator/accumulo/trunk/test/system/continuous/start-walkers.sh (props changed)
incubator/accumulo/trunk/test/system/continuous/stop-agitator.sh (props changed)
incubator/accumulo/trunk/test/system/continuous/stop-batchwalkers.sh (props changed)
incubator/accumulo/trunk/test/system/continuous/stop-ingest.sh (props changed)
incubator/accumulo/trunk/test/system/continuous/stop-scanners.sh (props changed)
incubator/accumulo/trunk/test/system/continuous/stop-stats.sh (props changed)
incubator/accumulo/trunk/test/system/continuous/stop-walkers.sh (props changed)
incubator/accumulo/trunk/test/system/randomwalk/bin/copy-config.sh (props changed)
incubator/accumulo/trunk/test/system/randomwalk/bin/kill-all.sh (props changed)
incubator/accumulo/trunk/test/system/randomwalk/bin/kill-local.sh (props changed)
incubator/accumulo/trunk/test/system/randomwalk/bin/start-all.sh (props changed)
incubator/accumulo/trunk/test/system/randomwalk/bin/start-local.sh (props changed)
incubator/accumulo/trunk/test/system/test1/ingest_test.sh (props changed)
incubator/accumulo/trunk/test/system/test1/ingest_test_2.sh (props changed)
incubator/accumulo/trunk/test/system/test1/ingest_test_3.sh (props changed)
incubator/accumulo/trunk/test/system/test1/verify_test.sh (props changed)
incubator/accumulo/trunk/test/system/test1/verify_test_2.sh (props changed)
incubator/accumulo/trunk/test/system/test2/concurrent.sh (props changed)
incubator/accumulo/trunk/test/system/test3/bigrow.sh (props changed)
incubator/accumulo/trunk/test/system/test4/bulk_import_test.sh (props changed)
incubator/accumulo/trunk/test/system/test5/insert_test.sh (props changed)
incubator/accumulo/trunk/test/system/upgrade_test.sh (props changed)
Propchange: incubator/accumulo/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 2 22:45:37 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-1296423
+/incubator/accumulo/branches/1.4:1201902-1296495
Propchange: incubator/accumulo/trunk/.gitignore
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/accumulo/trunk/bin/LogForwarder.sh
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Fri Mar 2 22:45:37 2012
@@ -1 +1 @@
-LF
+native
Propchange: incubator/accumulo/trunk/bin/accumulo
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Fri Mar 2 22:45:37 2012
@@ -1 +1 @@
-LF
+native
Propchange: incubator/accumulo/trunk/bin/check-slaves
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Fri Mar 2 22:45:37 2012
@@ -1 +1 @@
-LF
+native
Propchange: incubator/accumulo/trunk/bin/config.sh
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Fri Mar 2 22:45:37 2012
@@ -1 +1 @@
-LF
+native
Propchange: incubator/accumulo/trunk/bin/etc_initd_accumulo
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Fri Mar 2 22:45:37 2012
@@ -1 +1 @@
-LF
+native
Propchange: incubator/accumulo/trunk/bin/start-all.sh
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Fri Mar 2 22:45:37 2012
@@ -1 +1 @@
-LF
+native
Propchange: incubator/accumulo/trunk/bin/start-here.sh
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Fri Mar 2 22:45:37 2012
@@ -1 +1 @@
-LF
+native
Propchange: incubator/accumulo/trunk/bin/start-server.sh
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Fri Mar 2 22:45:37 2012
@@ -1 +1 @@
-LF
+native
Propchange: incubator/accumulo/trunk/bin/stop-all.sh
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Fri Mar 2 22:45:37 2012
@@ -1 +1 @@
-LF
+native
Propchange: incubator/accumulo/trunk/bin/stop-here.sh
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Fri Mar 2 22:45:37 2012
@@ -1 +1 @@
-LF
+native
Propchange: incubator/accumulo/trunk/bin/stop-server.sh
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Fri Mar 2 22:45:37 2012
@@ -1 +1 @@
-LF
+native
Propchange: incubator/accumulo/trunk/bin/tdown.sh
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Fri Mar 2 22:45:37 2012
@@ -1 +1 @@
-LF
+native
Propchange: incubator/accumulo/trunk/bin/tool.sh
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Fri Mar 2 22:45:37 2012
@@ -1 +1 @@
-LF
+native
Propchange: incubator/accumulo/trunk/bin/tup.sh
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Fri Mar 2 22:45:37 2012
@@ -1 +1 @@
-LF
+native
Propchange: incubator/accumulo/trunk/conf/accumulo-env.sh.1GBstandalone-default-example
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/accumulo/trunk/conf/accumulo-env.sh.1GBstandalone-native-example
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/accumulo/trunk/conf/accumulo-env.sh.2GBstandalone-default-example
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/accumulo/trunk/conf/accumulo-env.sh.2GBstandalone-native-example
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/accumulo/trunk/conf/accumulo-env.sh.3GBcluster-default-example
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/accumulo/trunk/conf/accumulo-env.sh.3GBcluster-native-example
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/accumulo/trunk/conf/accumulo-env.sh.512MBBstandalone-default-example
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/accumulo/trunk/conf/accumulo-env.sh.512MBBstandalone-native-example
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/accumulo/trunk/conf/accumulo-site.xml.1GBstandalone-example
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/accumulo/trunk/conf/accumulo-site.xml.2GBstandalone-example
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/accumulo/trunk/conf/accumulo-site.xml.3GBcluster-example
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/accumulo/trunk/conf/accumulo-site.xml.512MBBstandalone-example
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/accumulo/trunk/docs/examples/README.bulkIngest
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/docs/examples/README.bulkIngest?rev=1296504&r1=1296503&r2=1296504&view=diff
==============================================================================
--- incubator/accumulo/trunk/docs/examples/README.bulkIngest (original)
+++ incubator/accumulo/trunk/docs/examples/README.bulkIngest Fri Mar 2 22:45:37 2012
@@ -28,7 +28,7 @@ accumulo instance name, and a comma-sepa
$ ./bin/accumulo org.apache.accumulo.examples.simple.mapreduce.bulk.SetupTable instance zookeepers username password test_bulk row_00000333 row_00000666
$ ./bin/accumulo org.apache.accumulo.examples.simple.mapreduce.bulk.GenerateTestData 0 1000 bulk/test_1.txt
- $ ./bin/tool.sh lib/accumulo-examples-*[^c].jar org.apache.accumulo.examples.simple.mapreduce.bulk.BulkIngestExample instance zookeepers username password test_bulk bulk tmp/bulkWork
+ $ ./bin/tool.sh lib/examples-simple-*[^c].jar org.apache.accumulo.examples.simple.mapreduce.bulk.BulkIngestExample instance zookeepers username password test_bulk bulk tmp/bulkWork
$ ./bin/accumulo org.apache.accumulo.examples.simple.mapreduce.bulk.VerifyIngest instance zookeepers username password test_bulk 0 1000
For a high level discussion of bulk ingest, see the docs dir.
Propchange: incubator/accumulo/trunk/docs/examples/README.isolation
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/accumulo/trunk/docs/examples/README.visibility
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/accumulo/trunk/docs/src/user_manual/appendices/get_shell_commands.sh
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Fri Mar 2 22:45:37 2012
@@ -1 +1 @@
-LF
+native
Propchange: incubator/accumulo/trunk/docs/src/user_manual/build.sh
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Fri Mar 2 22:45:37 2012
@@ -1 +1 @@
-LF
+native
Propchange: incubator/accumulo/trunk/src/assemble/build.sh
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Fri Mar 2 22:45:37 2012
@@ -1 +1 @@
-LF
+native
Propchange: incubator/accumulo/trunk/src/assemble/docgen.sh
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Fri Mar 2 22:45:37 2012
@@ -1 +1 @@
-LF
+native
Propchange: incubator/accumulo/trunk/src/core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 2 22:45:37 2012
@@ -1,3 +1,3 @@
/incubator/accumulo/branches/1.3/src/core: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
/incubator/accumulo/branches/1.3.5rc/src/core:1209938
-/incubator/accumulo/branches/1.4/src/core:1201902-1296423
+/incubator/accumulo/branches/1.4/src/core:1201902-1296495
Propchange: incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/user/RowFilter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/accumulo/trunk/src/core/src/main/thrift/thrift.sh
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Fri Mar 2 22:45:37 2012
@@ -1 +1 @@
-LF
+native
Propchange: incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/iterators/user/RowFilterTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/helloworld/InsertWithBatchWriter.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/helloworld/InsertWithBatchWriter.java?rev=1296504&r1=1296503&r2=1296504&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/helloworld/InsertWithBatchWriter.java (original)
+++ incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/helloworld/InsertWithBatchWriter.java Fri Mar 2 22:45:37 2012
@@ -34,7 +34,7 @@ public class InsertWithBatchWriter {
TableNotFoundException {
if (args.length != 5) {
System.out
- .println("Usage: bin/tool.sh accumulo-examplesjar accumulo.examples.helloworld.InsertWithBatchWriter <instance name> <zoo keepers> <username> <password> <tableName>");
+ .println("Usage: accumulo examples-simplejar accumulo.examples.helloworld.InsertWithBatchWriter <instance name> <zoo keepers> <username> <password> <tableName>");
System.exit(1);
}
Propchange: incubator/accumulo/trunk/src/examples/wikisearch/README.parallel
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/accumulo/trunk/src/examples/wikisearch/ingest/conf/wikipedia_parallel.xml.example
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/accumulo/trunk/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/output/BufferingRFileRecordWriter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/accumulo/trunk/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/output/SortingRFileOutputFormat.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/accumulo/trunk/src/examples/wikisearch/ingest/src/main/protobuf/TermWeight.proto
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/accumulo/trunk/src/examples/wikisearch/ingest/src/main/protobuf/Uid.proto
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/accumulo/trunk/src/packages/deb/accumulo-custom-conf/control
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/accumulo/trunk/src/packages/deb/accumulo-custom-conf/control
('svn:executable' removed)
Propchange: incubator/accumulo/trunk/src/packages/deb/accumulo-gc/control
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/accumulo/trunk/src/packages/deb/accumulo-gc/control
('svn:executable' removed)
Propchange: incubator/accumulo/trunk/src/packages/deb/accumulo-logger/control
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/accumulo/trunk/src/packages/deb/accumulo-logger/control
('svn:executable' removed)
Propchange: incubator/accumulo/trunk/src/packages/deb/accumulo-master/control
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/accumulo/trunk/src/packages/deb/accumulo-master/control
('svn:executable' removed)
Propchange: incubator/accumulo/trunk/src/packages/deb/accumulo-monitor/control
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/accumulo/trunk/src/packages/deb/accumulo-monitor/control
('svn:executable' removed)
Propchange: incubator/accumulo/trunk/src/packages/deb/accumulo-native/control
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/accumulo/trunk/src/packages/deb/accumulo-native/control
('svn:executable' removed)
Propchange: incubator/accumulo/trunk/src/packages/deb/accumulo-native/postinst
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/accumulo/trunk/src/packages/deb/accumulo-native/postrm
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/accumulo/trunk/src/packages/deb/accumulo-single-conf/control
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/accumulo/trunk/src/packages/deb/accumulo-single-conf/control
('svn:executable' removed)
Propchange: incubator/accumulo/trunk/src/packages/deb/accumulo-singleton/control
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/accumulo/trunk/src/packages/deb/accumulo-singleton/control
('svn:executable' removed)
Propchange: incubator/accumulo/trunk/src/packages/deb/accumulo-slave/control
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/accumulo/trunk/src/packages/deb/accumulo-slave/control
('svn:executable' removed)
Propchange: incubator/accumulo/trunk/src/packages/deb/accumulo-test/control
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/accumulo/trunk/src/packages/deb/accumulo-test/control
('svn:executable' removed)
Propchange: incubator/accumulo/trunk/src/packages/deb/accumulo-tserver/control
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/accumulo/trunk/src/packages/deb/accumulo-tserver/control
('svn:executable' removed)
Propchange: incubator/accumulo/trunk/src/packages/deb/accumulo/conffile
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/accumulo/trunk/src/packages/deb/accumulo/control
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/accumulo/trunk/src/packages/deb/accumulo/control
('svn:executable' removed)
Propchange: incubator/accumulo/trunk/src/packages/deb/accumulo/postinst
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/accumulo/trunk/src/packages/deb/accumulo/postrm
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/accumulo/trunk/src/server/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 2 22:45:37 2012
@@ -1,3 +1,3 @@
/incubator/accumulo/branches/1.3/src/server: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
/incubator/accumulo/branches/1.3.5rc/src/server:1209938
-/incubator/accumulo/branches/1.4/src/server:1201902-1296423
+/incubator/accumulo/branches/1.4/src/server:1201902-1296495
Propchange: incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/fate/Admin.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/functional/MergeTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/accumulo/trunk/src/start/src/test/shell/makeTestJars.sh
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Fri Mar 2 22:45:37 2012
@@ -1 +1 @@
-LF
+native
Propchange: incubator/accumulo/trunk/src/trace/thrift.sh
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Fri Mar 2 22:45:37 2012
@@ -1 +1 @@
-LF
+native
Propchange: incubator/accumulo/trunk/test/system/auto/pkill.sh
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Fri Mar 2 22:45:37 2012
@@ -1 +1 @@
-LF
+native
Modified: incubator/accumulo/trunk/test/system/bench/lib/Benchmark.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/bench/lib/Benchmark.py?rev=1296504&r1=1296503&r2=1296504&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/bench/lib/Benchmark.py (original)
+++ incubator/accumulo/trunk/test/system/bench/lib/Benchmark.py Fri Mar 2 22:45:37 2012
@@ -99,7 +99,7 @@ class Benchmark(unittest.TestCase):
# Returns the location of the local examples jar
def getexamplejar(self):
- return self.findjar(accumulo() + '/lib/accumulo-examples*.jar')
+ return self.findjar(accumulo() + '/lib/examples-simple*.jar')
# Returns a string of core, thrift and zookeeper jars with a specified delim
def getjars(self, delim=','):
Propchange: incubator/accumulo/trunk/test/system/continuous/analyze-missing.sh
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Fri Mar 2 22:45:37 2012
@@ -1 +1 @@
-LF
+native
Propchange: incubator/accumulo/trunk/test/system/continuous/mapred-setup.sh
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Fri Mar 2 22:45:37 2012
@@ -1 +1 @@
-LF
+native
Propchange: incubator/accumulo/trunk/test/system/continuous/run-moru.sh
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Fri Mar 2 22:45:37 2012
@@ -1 +1 @@
-LF
+native
Propchange: incubator/accumulo/trunk/test/system/continuous/run-verify.sh
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Fri Mar 2 22:45:37 2012
@@ -1 +1 @@
-LF
+native
Propchange: incubator/accumulo/trunk/test/system/continuous/start-agitator.sh
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Fri Mar 2 22:45:37 2012
@@ -1 +1 @@
-LF
+native
Propchange: incubator/accumulo/trunk/test/system/continuous/start-batchwalkers.sh
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Fri Mar 2 22:45:37 2012
@@ -1 +1 @@
-LF
+native
Propchange: incubator/accumulo/trunk/test/system/continuous/start-ingest.sh
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Fri Mar 2 22:45:37 2012
@@ -1 +1 @@
-LF
+native
Propchange: incubator/accumulo/trunk/test/system/continuous/start-scanners.sh
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Fri Mar 2 22:45:37 2012
@@ -1 +1 @@
-LF
+native
Propchange: incubator/accumulo/trunk/test/system/continuous/start-stats.sh
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Fri Mar 2 22:45:37 2012
@@ -1 +1 @@
-LF
+native
Propchange: incubator/accumulo/trunk/test/system/continuous/start-walkers.sh
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Fri Mar 2 22:45:37 2012
@@ -1 +1 @@
-LF
+native
Propchange: incubator/accumulo/trunk/test/system/continuous/stop-agitator.sh
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Fri Mar 2 22:45:37 2012
@@ -1 +1 @@
-LF
+native
Propchange: incubator/accumulo/trunk/test/system/continuous/stop-batchwalkers.sh
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Fri Mar 2 22:45:37 2012
@@ -1 +1 @@
-LF
+native
Propchange: incubator/accumulo/trunk/test/system/continuous/stop-ingest.sh
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Fri Mar 2 22:45:37 2012
@@ -1 +1 @@
-LF
+native
Propchange: incubator/accumulo/trunk/test/system/continuous/stop-scanners.sh
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Fri Mar 2 22:45:37 2012
@@ -1 +1 @@
-LF
+native
Propchange: incubator/accumulo/trunk/test/system/continuous/stop-stats.sh
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Fri Mar 2 22:45:37 2012
@@ -1 +1 @@
-LF
+native
Propchange: incubator/accumulo/trunk/test/system/continuous/stop-walkers.sh
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Fri Mar 2 22:45:37 2012
@@ -1 +1 @@
-LF
+native
Propchange: incubator/accumulo/trunk/test/system/randomwalk/bin/copy-config.sh
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Fri Mar 2 22:45:37 2012
@@ -1 +1 @@
-LF
+native
Propchange: incubator/accumulo/trunk/test/system/randomwalk/bin/kill-all.sh
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Fri Mar 2 22:45:37 2012
@@ -1 +1 @@
-LF
+native
Propchange: incubator/accumulo/trunk/test/system/randomwalk/bin/kill-local.sh
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Fri Mar 2 22:45:37 2012
@@ -1 +1 @@
-LF
+native
Propchange: incubator/accumulo/trunk/test/system/randomwalk/bin/start-all.sh
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Fri Mar 2 22:45:37 2012
@@ -1 +1 @@
-LF
+native
Propchange: incubator/accumulo/trunk/test/system/randomwalk/bin/start-local.sh
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Fri Mar 2 22:45:37 2012
@@ -1 +1 @@
-LF
+native
Propchange: incubator/accumulo/trunk/test/system/test1/ingest_test.sh
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Fri Mar 2 22:45:37 2012
@@ -1 +1 @@
-LF
+native
Propchange: incubator/accumulo/trunk/test/system/test1/ingest_test_2.sh
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Fri Mar 2 22:45:37 2012
@@ -1 +1 @@
-LF
+native
Propchange: incubator/accumulo/trunk/test/system/test1/ingest_test_3.sh
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Fri Mar 2 22:45:37 2012
@@ -1 +1 @@
-LF
+native
Propchange: incubator/accumulo/trunk/test/system/test1/verify_test.sh
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Fri Mar 2 22:45:37 2012
@@ -1 +1 @@
-LF
+native
Propchange: incubator/accumulo/trunk/test/system/test1/verify_test_2.sh
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Fri Mar 2 22:45:37 2012
@@ -1 +1 @@
-LF
+native
Propchange: incubator/accumulo/trunk/test/system/test2/concurrent.sh
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Fri Mar 2 22:45:37 2012
@@ -1 +1 @@
-LF
+native
Propchange: incubator/accumulo/trunk/test/system/test3/bigrow.sh
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Fri Mar 2 22:45:37 2012
@@ -1 +1 @@
-LF
+native
Propchange: incubator/accumulo/trunk/test/system/test4/bulk_import_test.sh
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Fri Mar 2 22:45:37 2012
@@ -1 +1 @@
-LF
+native
Propchange: incubator/accumulo/trunk/test/system/test5/insert_test.sh
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Fri Mar 2 22:45:37 2012
@@ -1 +1 @@
-LF
+native
Propchange: incubator/accumulo/trunk/test/system/upgrade_test.sh
------------------------------------------------------------------------------
svn:eol-style = native