/[Apache-SVN]
ViewVC logotype

Revision 1230608

Jump to revision: Previous Next
Author: ecn
Date: Thu Jan 12 16:06:14 2012 UTC (12 years, 3 months ago)
Changed paths: 237 (showing only 100; show all)
Log Message: 
ACCUMULO-285 merge to trunk, resolve all 1.4 -> trunk merge conflicts

Changed paths

Path Details
Directoryincubator/accumulo/trunk/ modified , props changed
Directoryincubator/accumulo/trunk/contrib/accumulo_sample/ deleted
Directoryincubator/accumulo/trunk/pom.xml modified , text changed
Directoryincubator/accumulo/trunk/src/assemble/pom.xml modified , text changed
Directoryincubator/accumulo/trunk/src/core/ modified , props changed
Directoryincubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ClientService.java modified , text changed
Directoryincubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterClientService.java modified , text changed
Directoryincubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/MutationLogger.java modified , text changed
Directoryincubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletClientService.java modified , text changed
Directoryincubator/accumulo/trunk/src/examples/pom.xml modified , text changed
Directoryincubator/accumulo/trunk/src/examples/simple/ added
Directoryincubator/accumulo/trunk/src/examples/simple/pom.xml added
Directoryincubator/accumulo/trunk/src/examples/simple/src/ added
Directoryincubator/accumulo/trunk/src/examples/simple/src/main/ added
Directoryincubator/accumulo/trunk/src/examples/simple/src/main/java/ added
Directoryincubator/accumulo/trunk/src/examples/simple/src/main/java/org/ added
Directoryincubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/ added
Directoryincubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/ added
Directoryincubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/ added
Directoryincubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/mapreduce/ added
Directoryincubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/ added
Directoryincubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/ added
Directoryincubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/Flush.java added
Directoryincubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchScanner.java added
Directoryincubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchWriter.java added
Directoryincubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/ReadWriteExample.java added
Directoryincubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RowOperations.java added
Directoryincubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/SequentialBatchWriter.java added
Directoryincubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/combiner/ added
Directoryincubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/combiner/StatsCombiner.java added
Directoryincubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/constraints/ added
Directoryincubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/constraints/AlphaNumKeyConstraint.java added
Directoryincubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/constraints/MaxMutationSize.java added
Directoryincubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/constraints/NumericValueConstraint.java added
Directoryincubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/dirlist/ added
Directoryincubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/dirlist/FileCount.java added
Directoryincubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/dirlist/Ingest.java added
Directoryincubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/dirlist/QueryUtil.java added
Directoryincubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/dirlist/Viewer.java added
Directoryincubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/ added
Directoryincubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/ChunkCombiner.java added
Directoryincubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/ChunkInputFormat.java added
Directoryincubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/ChunkInputStream.java added
Directoryincubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/FileDataIngest.java added
Directoryincubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/FileDataQuery.java added
Directoryincubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/KeyUtil.java added
Directoryincubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/VisibilityCombiner.java added
Directoryincubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/helloworld/ added
Directoryincubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/helloworld/InsertWithBatchWriter.java added
Directoryincubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/helloworld/InsertWithOutputFormat.java added
Directoryincubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/helloworld/ReadData.java added
Directoryincubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/isolation/ added
Directoryincubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/isolation/InterferenceTest.java added
Directoryincubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/ added
Directoryincubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/RegexExample.java added
Directoryincubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/RowHash.java added
Directoryincubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TableToFile.java added
Directoryincubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TeraSortIngest.java added
Directoryincubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/WordCount.java added
Directoryincubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/bulk/ added
Directoryincubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/bulk/BulkIngestExample.java added
Directoryincubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/bulk/GenerateTestData.java added
Directoryincubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/bulk/SetupTable.java added
Directoryincubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/bulk/VerifyIngest.java added
Directoryincubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shard/ added
Directoryincubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shard/ContinuousQuery.java added
Directoryincubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shard/Index.java added
Directoryincubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shard/Query.java added
Directoryincubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shard/Reverse.java added
Directoryincubator/accumulo/trunk/src/examples/simple/src/test/ added
Directoryincubator/accumulo/trunk/src/examples/simple/src/test/java/ added
Directoryincubator/accumulo/trunk/src/examples/simple/src/test/java/org/ added
Directoryincubator/accumulo/trunk/src/examples/simple/src/test/java/org/apache/ added
Directoryincubator/accumulo/trunk/src/examples/simple/src/test/java/org/apache/accumulo/ added
Directoryincubator/accumulo/trunk/src/examples/simple/src/test/java/org/apache/accumulo/examples/ added
Directoryincubator/accumulo/trunk/src/examples/simple/src/test/java/org/apache/accumulo/examples/simple/ added
Directoryincubator/accumulo/trunk/src/examples/simple/src/test/java/org/apache/accumulo/examples/simple/dirlist/ added
Directoryincubator/accumulo/trunk/src/examples/simple/src/test/java/org/apache/accumulo/examples/simple/dirlist/CountTest.java added
Directoryincubator/accumulo/trunk/src/examples/simple/src/test/java/org/apache/accumulo/examples/simple/filedata/ added
Directoryincubator/accumulo/trunk/src/examples/simple/src/test/java/org/apache/accumulo/examples/simple/filedata/ChunkCombinerTest.java added
Directoryincubator/accumulo/trunk/src/examples/simple/src/test/java/org/apache/accumulo/examples/simple/filedata/ChunkInputFormatTest.java added
Directoryincubator/accumulo/trunk/src/examples/simple/src/test/java/org/apache/accumulo/examples/simple/filedata/ChunkInputStreamTest.java added
Directoryincubator/accumulo/trunk/src/examples/simple/src/test/java/org/apache/accumulo/examples/simple/filedata/KeyUtilTest.java added
Directoryincubator/accumulo/trunk/src/examples/src/ deleted
Directoryincubator/accumulo/trunk/src/examples/wikisearch/ added
Directoryincubator/accumulo/trunk/src/examples/wikisearch/README added
Directoryincubator/accumulo/trunk/src/examples/wikisearch/ingest/ added
Directoryincubator/accumulo/trunk/src/examples/wikisearch/ingest/bin/ added
Directoryincubator/accumulo/trunk/src/examples/wikisearch/ingest/bin/ingest.sh added
Directoryincubator/accumulo/trunk/src/examples/wikisearch/ingest/conf/ added
Directoryincubator/accumulo/trunk/src/examples/wikisearch/ingest/conf/wikipedia.xml.example added
Directoryincubator/accumulo/trunk/src/examples/wikisearch/ingest/pom.xml added
Directoryincubator/accumulo/trunk/src/examples/wikisearch/ingest/src/ added
Directoryincubator/accumulo/trunk/src/examples/wikisearch/ingest/src/assembly/ added
Directoryincubator/accumulo/trunk/src/examples/wikisearch/ingest/src/assembly/dist.xml added
Directoryincubator/accumulo/trunk/src/examples/wikisearch/ingest/src/main/ added
Directoryincubator/accumulo/trunk/src/examples/wikisearch/ingest/src/main/java/ added
Directoryincubator/accumulo/trunk/src/examples/wikisearch/ingest/src/main/java/org/ added
Directoryincubator/accumulo/trunk/src/examples/wikisearch/ingest/src/main/java/org/apache/ added
Directoryincubator/accumulo/trunk/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/ added
[...]
infrastructure at apache.org
 ViewVC Help
Powered by ViewVC 1.1.26