accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vi...@apache.org
Subject svn commit: r1391754 [1/11] - in /accumulo/branches/ACCUMULO-259: ./ assemble/ conf/ conf/examples/1GB/native-standalone/ conf/examples/1GB/standalone/ conf/examples/2GB/native-standalone/ conf/examples/2GB/standalone/ conf/examples/3GB/native-standalo...
Date Sat, 29 Sep 2012 05:43:13 GMT
Author: vines
Date: Sat Sep 29 05:42:59 2012
New Revision: 1391754

URL: http://svn.apache.org/viewvc?rev=1391754&view=rev
Log:
ACCUMULO-259 - merged

Added:
    accumulo/branches/ACCUMULO-259/README_UBUNTU
      - copied unchanged from r1391624, accumulo/trunk/README_UBUNTU
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/BatchWriterConfig.java
      - copied unchanged from r1391624, accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/BatchWriterConfig.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/TimedOutException.java
      - copied unchanged from r1391624, accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/TimedOutException.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/TimeoutTabletLocator.java
      - copied unchanged from r1391624, accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/TimeoutTabletLocator.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/format/HexFormatter.java
      - copied unchanged from r1391624, accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/format/HexFormatter.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/interpret/
      - copied from r1391624, accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/interpret/
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/interpret/DefaultScanInterpreter.java
      - copied unchanged from r1391624, accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/interpret/DefaultScanInterpreter.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/interpret/HexScanInterpreter.java
      - copied unchanged from r1391624, accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/interpret/HexScanInterpreter.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/interpret/ScanInterpreter.java
      - copied unchanged from r1391624, accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/interpret/ScanInterpreter.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ExportTableCommand.java
      - copied unchanged from r1391624, accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ExportTableCommand.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ImportTableCommand.java
      - copied unchanged from r1391624, accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ImportTableCommand.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/InterpreterCommand.java
      - copied unchanged from r1391624, accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/InterpreterCommand.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ShellPluginConfigurationCommand.java
      - copied unchanged from r1391624, accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ShellPluginConfigurationCommand.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/zookeeper/ZooCache.java
      - copied unchanged from r1391624, accumulo/trunk/core/src/main/java/org/apache/accumulo/core/zookeeper/ZooCache.java
    accumulo/branches/ACCUMULO-259/core/src/test/java/org/apache/accumulo/core/file/rfile/RelativeKeyTest.java
      - copied unchanged from r1391624, accumulo/trunk/core/src/test/java/org/apache/accumulo/core/file/rfile/RelativeKeyTest.java
    accumulo/branches/ACCUMULO-259/docs/examples/README.export
      - copied unchanged from r1391624, accumulo/trunk/docs/examples/README.export
    accumulo/branches/ACCUMULO-259/docs/src/developer_manual/accumulo_developer_manual.tex
      - copied unchanged from r1391624, accumulo/trunk/docs/src/developer_manual/accumulo_developer_manual.tex
    accumulo/branches/ACCUMULO-259/docs/src/developer_manual/build.sh
      - copied unchanged from r1391624, accumulo/trunk/docs/src/developer_manual/build.sh
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/tableOps/ExportTable.java
      - copied unchanged from r1391624, accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/tableOps/ExportTable.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/tableOps/ImportTable.java
      - copied, changed from r1391624, accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/tableOps/ImportTable.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/functional/SlowConstraint.java
      - copied unchanged from r1391624, accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/functional/SlowConstraint.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/functional/TimeoutTest.java
      - copied unchanged from r1391624, accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/functional/TimeoutTest.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/randomwalk/shard/ExportIndex.java
      - copied unchanged from r1391624, accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/randomwalk/shard/ExportIndex.java
    accumulo/branches/ACCUMULO-259/server/src/main/resources/web/vis.js
      - copied unchanged from r1391624, accumulo/trunk/server/src/main/resources/web/vis.js
    accumulo/branches/ACCUMULO-259/test/compat/japi-compliance/
      - copied from r1391624, accumulo/trunk/test/compat/japi-compliance/
    accumulo/branches/ACCUMULO-259/test/compat/japi-compliance/README
      - copied unchanged from r1391624, accumulo/trunk/test/compat/japi-compliance/README
    accumulo/branches/ACCUMULO-259/test/compat/japi-compliance/japi-accumulo-1.4.xml
      - copied unchanged from r1391624, accumulo/trunk/test/compat/japi-compliance/japi-accumulo-1.4.xml
    accumulo/branches/ACCUMULO-259/test/compat/japi-compliance/japi-accumulo-1.5.xml
      - copied unchanged from r1391624, accumulo/trunk/test/compat/japi-compliance/japi-accumulo-1.5.xml
    accumulo/branches/ACCUMULO-259/test/system/auto/simple/timeout.py
      - copied unchanged from r1391624, accumulo/trunk/test/system/auto/simple/timeout.py
Removed:
    accumulo/branches/ACCUMULO-259/docs/src/developer_manual/developer_manual.tex
    accumulo/branches/ACCUMULO-259/server/src/main/resources/web/vis.xml
Modified:
    accumulo/branches/ACCUMULO-259/   (props changed)
    accumulo/branches/ACCUMULO-259/README
    accumulo/branches/ACCUMULO-259/assemble/pom.xml
    accumulo/branches/ACCUMULO-259/conf/   (props changed)
    accumulo/branches/ACCUMULO-259/conf/examples/1GB/native-standalone/generic_logger.xml
    accumulo/branches/ACCUMULO-259/conf/examples/1GB/native-standalone/log4j.properties
    accumulo/branches/ACCUMULO-259/conf/examples/1GB/native-standalone/monitor_logger.xml
    accumulo/branches/ACCUMULO-259/conf/examples/1GB/standalone/generic_logger.xml
    accumulo/branches/ACCUMULO-259/conf/examples/1GB/standalone/log4j.properties
    accumulo/branches/ACCUMULO-259/conf/examples/1GB/standalone/monitor_logger.xml
    accumulo/branches/ACCUMULO-259/conf/examples/2GB/native-standalone/generic_logger.xml
    accumulo/branches/ACCUMULO-259/conf/examples/2GB/native-standalone/log4j.properties
    accumulo/branches/ACCUMULO-259/conf/examples/2GB/native-standalone/monitor_logger.xml
    accumulo/branches/ACCUMULO-259/conf/examples/2GB/standalone/generic_logger.xml
    accumulo/branches/ACCUMULO-259/conf/examples/2GB/standalone/log4j.properties
    accumulo/branches/ACCUMULO-259/conf/examples/2GB/standalone/monitor_logger.xml
    accumulo/branches/ACCUMULO-259/conf/examples/3GB/native-standalone/generic_logger.xml
    accumulo/branches/ACCUMULO-259/conf/examples/3GB/native-standalone/log4j.properties
    accumulo/branches/ACCUMULO-259/conf/examples/3GB/native-standalone/monitor_logger.xml
    accumulo/branches/ACCUMULO-259/conf/examples/3GB/standalone/generic_logger.xml
    accumulo/branches/ACCUMULO-259/conf/examples/3GB/standalone/log4j.properties
    accumulo/branches/ACCUMULO-259/conf/examples/3GB/standalone/monitor_logger.xml
    accumulo/branches/ACCUMULO-259/conf/examples/512MB/native-standalone/generic_logger.xml
    accumulo/branches/ACCUMULO-259/conf/examples/512MB/native-standalone/log4j.properties
    accumulo/branches/ACCUMULO-259/conf/examples/512MB/native-standalone/monitor_logger.xml
    accumulo/branches/ACCUMULO-259/conf/examples/512MB/standalone/generic_logger.xml
    accumulo/branches/ACCUMULO-259/conf/examples/512MB/standalone/log4j.properties
    accumulo/branches/ACCUMULO-259/conf/examples/512MB/standalone/monitor_logger.xml
    accumulo/branches/ACCUMULO-259/core/   (props changed)
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/Constants.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/bloomfilter/BloomFilter.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/bloomfilter/DynamicBloomFilter.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/bloomfilter/Filter.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/AccumuloException.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/AccumuloSecurityException.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/BatchScanner.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/ClientSideIteratorScanner.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/Connector.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/IsolatedScanner.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/IteratorSetting.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/Scanner.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/ScannerBase.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/admin/FindMax.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperationsImpl.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/AccumuloServerException.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/BatchWriterImpl.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/ConnectorImpl.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/MultiTableBatchWriterImpl.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/ScannerImpl.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/ScannerOptions.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchDeleter.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReader.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/TabletType.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ClientService.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ConfigurationType.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/TableOperation.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/TableOperationExceptionType.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ThriftTableOperationException.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloFileOutputFormat.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mock/MockBatchScanner.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mock/MockConnector.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mock/MockScanner.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mock/MockTableOperations.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/conf/Property.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/conf/SiteConfiguration.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/KeyExtent.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/Range.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/Value.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/InitialMultiScan.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/InitialScan.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/IterInfo.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/MapFileInfo.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/MultiScanResult.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/ScanResult.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/TColumn.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/TConstraintViolationSummary.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/TKey.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/TKeyExtent.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/TKeyValue.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/TMutation.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/TRange.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/UpdateErrors.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/file/FileUtil.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/file/blockfile/ABlockReader.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/BlockCache.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/file/rfile/BlockIndex.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/file/rfile/RFile.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/file/rfile/RFileOperations.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/file/rfile/RelativeKey.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/PrintInfo.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/TFile.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/TFileDumper.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCMonitorService.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCStatus.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/gc/thrift/GcCycleStats.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/SortedKeyValueIterator.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/WrappingIterator.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/user/IndexedDocIterator.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/master/thrift/Compacting.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/master/thrift/DeadServer.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterClientService.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterGoalState.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterMonitorInfo.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterState.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/master/thrift/RecoveryException.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/master/thrift/RecoveryStatus.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/master/thrift/TableInfo.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/master/thrift/TableOperation.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletLoadState.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletServerStatus.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletSplit.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/security/Authorizations.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/security/ColumnVisibility.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/security/VisibilityEvaluator.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/security/thrift/AuthInfo.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/security/thrift/SecurityErrorCode.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/security/thrift/ThriftSecurityException.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActionStats.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActiveScan.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ConstraintViolationException.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/IteratorConfig.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/NoSuchScanIDException.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/NotServingTabletException.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ScanState.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ScanType.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TIteratorSetting.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletClientService.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletMutations.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletStats.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TooManyFilesException.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/trace/TraceFormatter.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/ColumnFQ.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/Merge.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/MetadataTable.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/StopWatch.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/TableDiskUsage.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/ThriftUtil.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/format/DeleterFormatter.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/AboutCommand.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ActiveScanIterator.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/AddSplitsCommand.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/AuthenticateCommand.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ClasspathCommand.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ClearCommand.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/CloneTableCommand.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/CompactCommand.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ConfigCommand.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ConstraintCommand.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/CreateTableCommand.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/CreateUserCommand.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DUCommand.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DebugCommand.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteCommand.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteIterCommand.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteManyCommand.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteRowsCommand.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteScanIterCommand.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteTableCommand.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DropUserCommand.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/EGrepCommand.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/EscapeTokenizer.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ExecfileCommand.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ExitCommand.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/FlushCommand.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/FormatterCommand.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/GetAuthsCommand.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/GetGroupsCommand.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/GetSplitsCommand.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/GrantCommand.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/GrepCommand.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/HelpCommand.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/HiddenCommand.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/HistoryCommand.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ImportDirectoryCommand.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/InsertCommand.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ListIterCommand.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ListScansCommand.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/MaxRowCommand.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/MergeCommand.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/NoTableCommand.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/OfflineCommand.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/OnlineCommand.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/OptUtil.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/PasswdCommand.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/QuotedStringTokenizer.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/RenameTableCommand.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/RevokeCommand.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ScanCommand.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/SetAuthsCommand.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/SetGroupsCommand.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/SetIterCommand.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/SetScanIterCommand.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/SleepCommand.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/SystemPermissionsCommand.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/TableCommand.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/TableOperation.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/TablePermissionsCommand.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/TablesCommand.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/TraceCommand.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/UserCommand.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/UserPermissionsCommand.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/UsersCommand.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/WhoAmICommand.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/zookeeper/ZooUtil.java
    accumulo/branches/ACCUMULO-259/core/src/main/thrift/client.thrift
    accumulo/branches/ACCUMULO-259/core/src/main/thrift/master.thrift
    accumulo/branches/ACCUMULO-259/core/src/main/thrift/thrift.sh
    accumulo/branches/ACCUMULO-259/core/src/test/java/org/apache/accumulo/core/client/ClientSideIteratorTest.java
    accumulo/branches/ACCUMULO-259/core/src/test/java/org/apache/accumulo/core/client/RowIteratorTest.java
    accumulo/branches/ACCUMULO-259/core/src/test/java/org/apache/accumulo/core/client/admin/FindMaxTest.java
    accumulo/branches/ACCUMULO-259/core/src/test/java/org/apache/accumulo/core/client/admin/TableOperationsHelperTest.java
    accumulo/branches/ACCUMULO-259/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloFileOutputFormatTest.java
    accumulo/branches/ACCUMULO-259/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormatTest.java
    accumulo/branches/ACCUMULO-259/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormatTest.java
    accumulo/branches/ACCUMULO-259/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloRowInputFormatTest.java
    accumulo/branches/ACCUMULO-259/core/src/test/java/org/apache/accumulo/core/client/mock/MockConnectorTest.java
    accumulo/branches/ACCUMULO-259/core/src/test/java/org/apache/accumulo/core/data/KeyTest.java
    accumulo/branches/ACCUMULO-259/core/src/test/java/org/apache/accumulo/core/file/rfile/RFileTest.java
    accumulo/branches/ACCUMULO-259/core/src/test/java/org/apache/accumulo/core/iterators/user/IndexedDocIteratorTest.java
    accumulo/branches/ACCUMULO-259/core/src/test/java/org/apache/accumulo/core/iterators/user/IntersectingIteratorTest.java
    accumulo/branches/ACCUMULO-259/core/src/test/java/org/apache/accumulo/core/iterators/user/RowFilterTest.java
    accumulo/branches/ACCUMULO-259/core/src/test/java/org/apache/accumulo/core/security/AuthorizationsTest.java
    accumulo/branches/ACCUMULO-259/core/src/test/java/org/apache/accumulo/core/security/ColumnVisibilityTest.java
    accumulo/branches/ACCUMULO-259/core/src/test/java/org/apache/accumulo/core/security/VisibilityEvaluatorTest.java
    accumulo/branches/ACCUMULO-259/core/src/test/java/org/apache/accumulo/core/util/shell/command/FormatterCommandTest.java
    accumulo/branches/ACCUMULO-259/docs/   (props changed)
    accumulo/branches/ACCUMULO-259/docs/examples/README.bloom
    accumulo/branches/ACCUMULO-259/docs/src/user_manual/   (props changed)
    accumulo/branches/ACCUMULO-259/docs/src/user_manual/appendices/   (props changed)
    accumulo/branches/ACCUMULO-259/docs/src/user_manual/build.sh
    accumulo/branches/ACCUMULO-259/docs/src/user_manual/chapters/   (props changed)
    accumulo/branches/ACCUMULO-259/docs/src/user_manual/chapters/analytics.tex
    accumulo/branches/ACCUMULO-259/docs/src/user_manual/chapters/shell.tex
    accumulo/branches/ACCUMULO-259/docs/src/user_manual/chapters/table_configuration.tex
    accumulo/branches/ACCUMULO-259/fate/src/main/java/org/apache/accumulo/fate/AdminUtil.java
    accumulo/branches/ACCUMULO-259/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooLock.java
    accumulo/branches/ACCUMULO-259/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooQueueLock.java
    accumulo/branches/ACCUMULO-259/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReader.java
    accumulo/branches/ACCUMULO-259/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReaderWriter.java
    accumulo/branches/ACCUMULO-259/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
    accumulo/branches/ACCUMULO-259/pom.xml
    accumulo/branches/ACCUMULO-259/server/   (props changed)
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/client/BulkImporter.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/gc/GarbageCollectWriteAheadLogs.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/Master.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/recovery/SubmitFileForRecovery.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/state/MetaDataStateStore.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/state/MetaDataTableScanner.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/state/RootTabletStateStore.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/state/TabletStateChangeIterator.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/state/tables/TableManager.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/tableOps/BulkImport.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/tableOps/CompactRange.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/tableOps/TableRangeOp.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/monitor/servlets/VisServlet.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/monitor/servlets/trace/NullScanner.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/monitor/servlets/trace/ShowTrace.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/tabletserver/log/MultiReader.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/CreateTestTable.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/EstimateInMemMapOverhead.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/GCLotsOfCandidatesTest.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/NativeMapConcurrencyTest.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/NativeMapPerformanceTest.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/NullBatchWriter.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/QueryMetadataTable.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/TestBinaryRows.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/TestIngest.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/TestMultiTableIngest.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/TestRandomDeletes.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/VerifyIngest.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousBatchWalker.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousIngest.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousQuery.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousScanner.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousWalk.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/continuous/Histogram.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/functional/AddSplitTest.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/functional/BadIteratorMincTest.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/functional/BatchScanSplitTest.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/functional/BatchWriterFlushTest.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/functional/BloomFilterTest.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/functional/ConcurrencyTest.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/functional/ConstraintTest.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/functional/CreateAndUseTest.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/functional/DeleteEverythingTest.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/functional/DeleteRowsSplitTest.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/functional/DeleteRowsTest.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/functional/FunctionalTest.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/functional/LargeRowTest.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/functional/LogicalTimeTest.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/functional/MaxOpenTest.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/functional/MergeTest.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/functional/PermissionsTest.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/functional/RowDeleteTest.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/functional/ScanIteratorTest.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/functional/ScanRangeTest.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/functional/ScanSessionTimeOutTest.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/functional/ServerSideErrorTest.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/functional/SparseColumnFamilyTest.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/functional/VisibilityTest.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/functional/ZombieTServer.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/performance/metadata/MetadataBatchScanTest.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/performance/scan/CollectTabletStats.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/randomwalk/State.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/randomwalk/concurrent/BatchWrite.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/TableOp.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/randomwalk/sequential/BatchVerify.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/randomwalk/shard/Reindex.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/randomwalk/shard/VerifyIndex.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/scalability/Ingest.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/scalability/ScaleTest.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/trace/TraceServer.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/util/AddFilesWithMissingEntries.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/util/CheckForMetadataProblems.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/util/Initialize.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/util/ListInstances.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/util/MetadataTable.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/util/RandomWriter.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/util/SendLogToChainsaw.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/util/TabletIterator.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/util/TabletServerLocks.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/zookeeper/ZooReaderWriter.java
    accumulo/branches/ACCUMULO-259/server/src/test/java/org/apache/accumulo/server/constraints/MetadataConstraintsTest.java
    accumulo/branches/ACCUMULO-259/server/src/test/java/org/apache/accumulo/server/gc/TestConfirmDeletes.java
    accumulo/branches/ACCUMULO-259/server/src/test/java/org/apache/accumulo/server/master/TestMergeState.java
    accumulo/branches/ACCUMULO-259/server/src/test/java/org/apache/accumulo/server/test/iterator/RegExTest.java
    accumulo/branches/ACCUMULO-259/server/src/test/java/org/apache/accumulo/server/util/CloneTest.java
    accumulo/branches/ACCUMULO-259/server/src/test/java/org/apache/accumulo/server/util/TabletIteratorTest.java
    accumulo/branches/ACCUMULO-259/src/   (props changed)
    accumulo/branches/ACCUMULO-259/start/src/main/java/org/apache/accumulo/start/Main.java
    accumulo/branches/ACCUMULO-259/start/src/main/java/org/apache/accumulo/start/TestMain.java
    accumulo/branches/ACCUMULO-259/test/compat/diffAPI.pl
    accumulo/branches/ACCUMULO-259/test/system/continuous/   (props changed)
    accumulo/branches/ACCUMULO-259/test/system/randomwalk/conf/modules/Shard.xml
    accumulo/branches/ACCUMULO-259/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/thrift/TraceWrap.java
    accumulo/branches/ACCUMULO-259/trace/thrift.sh

Propchange: accumulo/branches/ACCUMULO-259/
------------------------------------------------------------------------------
  Merged /accumulo/trunk/src:r1359721
  Merged /accumulo/branches/1.4/src:r1364778,1365213,1382566,1382923,1388120
  Merged /accumulo/trunk:r1363474-1391624
  Merged /accumulo/branches/1.4:r1356924-1358205,1358207-1382577,1382613,1388120,1388629

Modified: accumulo/branches/ACCUMULO-259/README
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/README?rev=1391754&r1=1391753&r2=1391754&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/README (original)
+++ accumulo/branches/ACCUMULO-259/README Sat Sep 29 05:42:59 2012
@@ -15,9 +15,11 @@ ready to go on x86 GNU/Linux: there is n
 
 However, if you only have source code, or you wish to make changes, you need to
 have maven configured to get Accumulo prerequisites from repositories.  See
-the pom.xml file for the necessary components.
+the pom.xml file for the necessary components. Activate the 'docs' profile to build
+the Accumulo developer and user manual.
 
-Run "mvn package -P assemble"
+Run "mvn package -P assemble" to build a distribution, or run "mvn package -P assemble,docs"
+to also build the documentation.
 
 If you are running on another Unix-like operating system (OSX, etc) then
 you may wish to build the native libraries.  They are not strictly necessary
@@ -52,7 +54,7 @@ There are no steps for upgrading from 1.
 Apache Accumulo has two prerequisites, hadoop and zookeeper. Zookeeper must be 
 at least version 3.3.0. Both of these must be installed and configured. 
 Zookeeper normally only allows for 10 connections from one computer.  On a 
-single-host install, this number is a little two low.  Add the following to the 
+single-host install, this number is a little too low.  Add the following to the 
 $ZOOKEEPER_HOME/conf/zoo.cfg file:
 
    maxClientCnxns=100

Modified: accumulo/branches/ACCUMULO-259/assemble/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/assemble/pom.xml?rev=1391754&r1=1391753&r2=1391754&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/assemble/pom.xml (original)
+++ accumulo/branches/ACCUMULO-259/assemble/pom.xml Sat Sep 29 05:42:59 2012
@@ -45,11 +45,6 @@
     </dependency>
     <dependency>
       <groupId>org.apache.accumulo</groupId>
-      <artifactId>wikisearch-query-war</artifactId>
-      <type>war</type>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.accumulo</groupId>
       <artifactId>cloudtrace</artifactId>
     </dependency>
   </dependencies>
@@ -61,19 +56,6 @@
         <artifactId>exec-maven-plugin</artifactId>
         <executions>
           <execution>
-            <id>user-manual</id>
-            <phase>prepare-package</phase>
-            <goals>
-              <goal>exec</goal>
-            </goals>
-            <configuration>
-              <executable>bash</executable>
-              <arguments>
-                <argument>../docs/src/user_manual/build.sh</argument>
-              </arguments>
-            </configuration>
-          </execution>
-          <execution>
             <id>config webpage</id>
             <phase>package</phase>
             <goals>
@@ -412,5 +394,44 @@
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>docs</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>exec-maven-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>developer-manual</id>
+                <phase>prepare-package</phase>
+                <goals>
+                  <goal>exec</goal>
+                </goals>
+                <configuration>
+                  <executable>bash</executable>
+                  <arguments>
+                    <argument>../docs/src/developer_manual/build.sh</argument>
+                  </arguments>
+                </configuration>
+              </execution>
+              <execution>
+                <id>user-manual</id>
+                <phase>prepare-package</phase>
+                <goals>
+                  <goal>exec</goal>
+                </goals>
+                <configuration>
+                  <executable>bash</executable>
+                  <arguments>
+                    <argument>../docs/src/user_manual/build.sh</argument>
+                  </arguments>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
   </profiles>
 </project>

Propchange: accumulo/branches/ACCUMULO-259/conf/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Sep 29 05:42:59 2012
@@ -11,3 +11,6 @@ accumulo_user_manual.pdf
 log4j.properties
 generic_logger.xml
 monitor_logger.xml
+generic_logger.xml.bkp
+log4j.properties.bkp
+monitor_logger.xml.bkp

Modified: accumulo/branches/ACCUMULO-259/conf/examples/1GB/native-standalone/generic_logger.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/conf/examples/1GB/native-standalone/generic_logger.xml?rev=1391754&r1=1391753&r2=1391754&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/conf/examples/1GB/native-standalone/generic_logger.xml (original)
+++ accumulo/branches/ACCUMULO-259/conf/examples/1GB/native-standalone/generic_logger.xml Sat Sep 29 05:42:59 2012
@@ -25,7 +25,7 @@
      <param name="MaxBackupIndex" value="10"/>
      <param name="Threshold"      value="DEBUG"/>
      <layout class="org.apache.log4j.PatternLayout">
-       <param name="ConversionPattern" value="%d{dd HH:mm:ss,SSS} [%-8c{2}] %-5p: %m%n"/>
+       <param name="ConversionPattern" value="%d{ISO8601} [%-8c{2}] %-5p: %m%n"/>
      </layout>	    
   </appender>
 
@@ -36,7 +36,7 @@
      <param name="MaxBackupIndex" value="10"/>
      <param name="Threshold"      value="INFO"/>
      <layout class="org.apache.log4j.PatternLayout">
-       <param name="ConversionPattern" value="%d{dd HH:mm:ss,SSS} [%-8c{2}] %-5p: %m%n"/>
+       <param name="ConversionPattern" value="%d{ISO8601} [%-8c{2}] %-5p: %m%n"/>
      </layout>	    
   </appender>
 
@@ -69,10 +69,6 @@
      <level value="INFO"/>
   </logger>
 
-  <logger name="org.apache.accumulo.examples.wikisearch">
-     <level value="INFO"/>
-  </logger>
-
   <logger name="org.mortbay.log">
      <level value="WARN"/>
   </logger>

Modified: accumulo/branches/ACCUMULO-259/conf/examples/1GB/native-standalone/log4j.properties
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/conf/examples/1GB/native-standalone/log4j.properties?rev=1391754&r1=1391753&r2=1391754&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/conf/examples/1GB/native-standalone/log4j.properties (original)
+++ accumulo/branches/ACCUMULO-259/conf/examples/1GB/native-standalone/log4j.properties Sat Sep 29 05:42:59 2012
@@ -35,5 +35,5 @@ log4j.logger.org.apache.accumulo.core.ut
 
 # Send most things to the console
 log4j.appender.A1=org.apache.log4j.ConsoleAppender
-log4j.appender.A1.layout.ConversionPattern=%d{dd HH:mm:ss,SSS} [%-8c{2}] %-5p: %m%n
+log4j.appender.A1.layout.ConversionPattern=%d{ISO8601} [%-8c{2}] %-5p: %m%n
 log4j.appender.A1.layout=org.apache.log4j.PatternLayout

Modified: accumulo/branches/ACCUMULO-259/conf/examples/1GB/native-standalone/monitor_logger.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/conf/examples/1GB/native-standalone/monitor_logger.xml?rev=1391754&r1=1391753&r2=1391754&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/conf/examples/1GB/native-standalone/monitor_logger.xml (original)
+++ accumulo/branches/ACCUMULO-259/conf/examples/1GB/native-standalone/monitor_logger.xml Sat Sep 29 05:42:59 2012
@@ -25,7 +25,7 @@
      <param name="MaxBackupIndex" value="10"/>
      <param name="Threshold"      value="DEBUG"/>
      <layout class="org.apache.log4j.PatternLayout">
-       <param name="ConversionPattern" value="%d{dd HH:mm:ss,SSS} [%-8c{2}] %-5p: %X{application} %m%n"/>
+       <param name="ConversionPattern" value="%d{ISO8601} [%-8c{2}] %-5p: %X{application} %m%n"/>
      </layout>	    
   </appender>
 
@@ -36,7 +36,7 @@
      <param name="MaxBackupIndex" value="10"/>
      <param name="Threshold"      value="INFO"/>
      <layout class="org.apache.log4j.PatternLayout">
-       <param name="ConversionPattern" value="%d{dd HH:mm:ss,SSS} [%-8c{2}] %-5p: %X{application} %m%n"/>
+       <param name="ConversionPattern" value="%d{ISO8601} [%-8c{2}] %-5p: %X{application} %m%n"/>
      </layout>	    
   </appender>
 

Modified: accumulo/branches/ACCUMULO-259/conf/examples/1GB/standalone/generic_logger.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/conf/examples/1GB/standalone/generic_logger.xml?rev=1391754&r1=1391753&r2=1391754&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/conf/examples/1GB/standalone/generic_logger.xml (original)
+++ accumulo/branches/ACCUMULO-259/conf/examples/1GB/standalone/generic_logger.xml Sat Sep 29 05:42:59 2012
@@ -25,7 +25,7 @@
      <param name="MaxBackupIndex" value="10"/>
      <param name="Threshold"      value="DEBUG"/>
      <layout class="org.apache.log4j.PatternLayout">
-       <param name="ConversionPattern" value="%d{dd HH:mm:ss,SSS} [%-8c{2}] %-5p: %m%n"/>
+       <param name="ConversionPattern" value="%d{ISO8601} [%-8c{2}] %-5p: %m%n"/>
      </layout>	    
   </appender>
 
@@ -36,7 +36,7 @@
      <param name="MaxBackupIndex" value="10"/>
      <param name="Threshold"      value="INFO"/>
      <layout class="org.apache.log4j.PatternLayout">
-       <param name="ConversionPattern" value="%d{dd HH:mm:ss,SSS} [%-8c{2}] %-5p: %m%n"/>
+       <param name="ConversionPattern" value="%d{ISO8601} [%-8c{2}] %-5p: %m%n"/>
      </layout>	    
   </appender>
 
@@ -69,10 +69,6 @@
      <level value="INFO"/>
   </logger>
 
-  <logger name="org.apache.accumulo.examples.wikisearch">
-     <level value="INFO"/>
-  </logger>
-
   <logger name="org.mortbay.log">
      <level value="WARN"/>
   </logger>

Modified: accumulo/branches/ACCUMULO-259/conf/examples/1GB/standalone/log4j.properties
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/conf/examples/1GB/standalone/log4j.properties?rev=1391754&r1=1391753&r2=1391754&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/conf/examples/1GB/standalone/log4j.properties (original)
+++ accumulo/branches/ACCUMULO-259/conf/examples/1GB/standalone/log4j.properties Sat Sep 29 05:42:59 2012
@@ -35,5 +35,5 @@ log4j.logger.org.apache.accumulo.core.ut
 
 # Send most things to the console
 log4j.appender.A1=org.apache.log4j.ConsoleAppender
-log4j.appender.A1.layout.ConversionPattern=%d{dd HH:mm:ss,SSS} [%-8c{2}] %-5p: %m%n
+log4j.appender.A1.layout.ConversionPattern=%d{ISO8601} [%-8c{2}] %-5p: %m%n
 log4j.appender.A1.layout=org.apache.log4j.PatternLayout

Modified: accumulo/branches/ACCUMULO-259/conf/examples/1GB/standalone/monitor_logger.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/conf/examples/1GB/standalone/monitor_logger.xml?rev=1391754&r1=1391753&r2=1391754&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/conf/examples/1GB/standalone/monitor_logger.xml (original)
+++ accumulo/branches/ACCUMULO-259/conf/examples/1GB/standalone/monitor_logger.xml Sat Sep 29 05:42:59 2012
@@ -25,7 +25,7 @@
      <param name="MaxBackupIndex" value="10"/>
      <param name="Threshold"      value="DEBUG"/>
      <layout class="org.apache.log4j.PatternLayout">
-       <param name="ConversionPattern" value="%d{dd HH:mm:ss,SSS} [%-8c{2}] %-5p: %X{application} %m%n"/>
+       <param name="ConversionPattern" value="%d{ISO8601} [%-8c{2}] %-5p: %X{application} %m%n"/>
      </layout>	    
   </appender>
 
@@ -36,7 +36,7 @@
      <param name="MaxBackupIndex" value="10"/>
      <param name="Threshold"      value="INFO"/>
      <layout class="org.apache.log4j.PatternLayout">
-       <param name="ConversionPattern" value="%d{dd HH:mm:ss,SSS} [%-8c{2}] %-5p: %X{application} %m%n"/>
+       <param name="ConversionPattern" value="%d{ISO8601} [%-8c{2}] %-5p: %X{application} %m%n"/>
      </layout>	    
   </appender>
 

Modified: accumulo/branches/ACCUMULO-259/conf/examples/2GB/native-standalone/generic_logger.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/conf/examples/2GB/native-standalone/generic_logger.xml?rev=1391754&r1=1391753&r2=1391754&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/conf/examples/2GB/native-standalone/generic_logger.xml (original)
+++ accumulo/branches/ACCUMULO-259/conf/examples/2GB/native-standalone/generic_logger.xml Sat Sep 29 05:42:59 2012
@@ -25,7 +25,7 @@
      <param name="MaxBackupIndex" value="10"/>
      <param name="Threshold"      value="DEBUG"/>
      <layout class="org.apache.log4j.PatternLayout">
-       <param name="ConversionPattern" value="%d{dd HH:mm:ss,SSS} [%-8c{2}] %-5p: %m%n"/>
+       <param name="ConversionPattern" value="%d{ISO8601} [%-8c{2}] %-5p: %m%n"/>
      </layout>	    
   </appender>
 
@@ -36,7 +36,7 @@
      <param name="MaxBackupIndex" value="10"/>
      <param name="Threshold"      value="INFO"/>
      <layout class="org.apache.log4j.PatternLayout">
-       <param name="ConversionPattern" value="%d{dd HH:mm:ss,SSS} [%-8c{2}] %-5p: %m%n"/>
+       <param name="ConversionPattern" value="%d{ISO8601} [%-8c{2}] %-5p: %m%n"/>
      </layout>	    
   </appender>
 
@@ -69,10 +69,6 @@
      <level value="INFO"/>
   </logger>
 
-  <logger name="org.apache.accumulo.examples.wikisearch">
-     <level value="INFO"/>
-  </logger>
-
   <logger name="org.mortbay.log">
      <level value="WARN"/>
   </logger>

Modified: accumulo/branches/ACCUMULO-259/conf/examples/2GB/native-standalone/log4j.properties
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/conf/examples/2GB/native-standalone/log4j.properties?rev=1391754&r1=1391753&r2=1391754&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/conf/examples/2GB/native-standalone/log4j.properties (original)
+++ accumulo/branches/ACCUMULO-259/conf/examples/2GB/native-standalone/log4j.properties Sat Sep 29 05:42:59 2012
@@ -35,5 +35,5 @@ log4j.logger.org.apache.accumulo.core.ut
 
 # Send most things to the console
 log4j.appender.A1=org.apache.log4j.ConsoleAppender
-log4j.appender.A1.layout.ConversionPattern=%d{dd HH:mm:ss,SSS} [%-8c{2}] %-5p: %m%n
+log4j.appender.A1.layout.ConversionPattern=%d{ISO8601} [%-8c{2}] %-5p: %m%n
 log4j.appender.A1.layout=org.apache.log4j.PatternLayout

Modified: accumulo/branches/ACCUMULO-259/conf/examples/2GB/native-standalone/monitor_logger.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/conf/examples/2GB/native-standalone/monitor_logger.xml?rev=1391754&r1=1391753&r2=1391754&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/conf/examples/2GB/native-standalone/monitor_logger.xml (original)
+++ accumulo/branches/ACCUMULO-259/conf/examples/2GB/native-standalone/monitor_logger.xml Sat Sep 29 05:42:59 2012
@@ -25,7 +25,7 @@
      <param name="MaxBackupIndex" value="10"/>
      <param name="Threshold"      value="DEBUG"/>
      <layout class="org.apache.log4j.PatternLayout">
-       <param name="ConversionPattern" value="%d{dd HH:mm:ss,SSS} [%-8c{2}] %-5p: %X{application} %m%n"/>
+       <param name="ConversionPattern" value="%d{ISO8601} [%-8c{2}] %-5p: %X{application} %m%n"/>
      </layout>	    
   </appender>
 
@@ -36,7 +36,7 @@
      <param name="MaxBackupIndex" value="10"/>
      <param name="Threshold"      value="INFO"/>
      <layout class="org.apache.log4j.PatternLayout">
-       <param name="ConversionPattern" value="%d{dd HH:mm:ss,SSS} [%-8c{2}] %-5p: %X{application} %m%n"/>
+       <param name="ConversionPattern" value="%d{ISO8601} [%-8c{2}] %-5p: %X{application} %m%n"/>
      </layout>	    
   </appender>
 

Modified: accumulo/branches/ACCUMULO-259/conf/examples/2GB/standalone/generic_logger.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/conf/examples/2GB/standalone/generic_logger.xml?rev=1391754&r1=1391753&r2=1391754&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/conf/examples/2GB/standalone/generic_logger.xml (original)
+++ accumulo/branches/ACCUMULO-259/conf/examples/2GB/standalone/generic_logger.xml Sat Sep 29 05:42:59 2012
@@ -25,7 +25,7 @@
      <param name="MaxBackupIndex" value="10"/>
      <param name="Threshold"      value="DEBUG"/>
      <layout class="org.apache.log4j.PatternLayout">
-       <param name="ConversionPattern" value="%d{dd HH:mm:ss,SSS} [%-8c{2}] %-5p: %m%n"/>
+       <param name="ConversionPattern" value="%d{ISO8601} [%-8c{2}] %-5p: %m%n"/>
      </layout>	    
   </appender>
 
@@ -36,7 +36,7 @@
      <param name="MaxBackupIndex" value="10"/>
      <param name="Threshold"      value="INFO"/>
      <layout class="org.apache.log4j.PatternLayout">
-       <param name="ConversionPattern" value="%d{dd HH:mm:ss,SSS} [%-8c{2}] %-5p: %m%n"/>
+       <param name="ConversionPattern" value="%d{ISO8601} [%-8c{2}] %-5p: %m%n"/>
      </layout>	    
   </appender>
 
@@ -69,10 +69,6 @@
      <level value="INFO"/>
   </logger>
 
-  <logger name="org.apache.accumulo.examples.wikisearch">
-     <level value="INFO"/>
-  </logger>
-
   <logger name="org.mortbay.log">
      <level value="WARN"/>
   </logger>

Modified: accumulo/branches/ACCUMULO-259/conf/examples/2GB/standalone/log4j.properties
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/conf/examples/2GB/standalone/log4j.properties?rev=1391754&r1=1391753&r2=1391754&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/conf/examples/2GB/standalone/log4j.properties (original)
+++ accumulo/branches/ACCUMULO-259/conf/examples/2GB/standalone/log4j.properties Sat Sep 29 05:42:59 2012
@@ -35,5 +35,5 @@ log4j.logger.org.apache.accumulo.core.ut
 
 # Send most things to the console
 log4j.appender.A1=org.apache.log4j.ConsoleAppender
-log4j.appender.A1.layout.ConversionPattern=%d{dd HH:mm:ss,SSS} [%-8c{2}] %-5p: %m%n
+log4j.appender.A1.layout.ConversionPattern=%d{ISO8601} [%-8c{2}] %-5p: %m%n
 log4j.appender.A1.layout=org.apache.log4j.PatternLayout

Modified: accumulo/branches/ACCUMULO-259/conf/examples/2GB/standalone/monitor_logger.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/conf/examples/2GB/standalone/monitor_logger.xml?rev=1391754&r1=1391753&r2=1391754&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/conf/examples/2GB/standalone/monitor_logger.xml (original)
+++ accumulo/branches/ACCUMULO-259/conf/examples/2GB/standalone/monitor_logger.xml Sat Sep 29 05:42:59 2012
@@ -25,7 +25,7 @@
      <param name="MaxBackupIndex" value="10"/>
      <param name="Threshold"      value="DEBUG"/>
      <layout class="org.apache.log4j.PatternLayout">
-       <param name="ConversionPattern" value="%d{dd HH:mm:ss,SSS} [%-8c{2}] %-5p: %X{application} %m%n"/>
+       <param name="ConversionPattern" value="%d{ISO8601} [%-8c{2}] %-5p: %X{application} %m%n"/>
      </layout>	    
   </appender>
 
@@ -36,7 +36,7 @@
      <param name="MaxBackupIndex" value="10"/>
      <param name="Threshold"      value="INFO"/>
      <layout class="org.apache.log4j.PatternLayout">
-       <param name="ConversionPattern" value="%d{dd HH:mm:ss,SSS} [%-8c{2}] %-5p: %X{application} %m%n"/>
+       <param name="ConversionPattern" value="%d{ISO8601} [%-8c{2}] %-5p: %X{application} %m%n"/>
      </layout>	    
   </appender>
 

Modified: accumulo/branches/ACCUMULO-259/conf/examples/3GB/native-standalone/generic_logger.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/conf/examples/3GB/native-standalone/generic_logger.xml?rev=1391754&r1=1391753&r2=1391754&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/conf/examples/3GB/native-standalone/generic_logger.xml (original)
+++ accumulo/branches/ACCUMULO-259/conf/examples/3GB/native-standalone/generic_logger.xml Sat Sep 29 05:42:59 2012
@@ -25,7 +25,7 @@
      <param name="MaxBackupIndex" value="10"/>
      <param name="Threshold"      value="DEBUG"/>
      <layout class="org.apache.log4j.PatternLayout">
-       <param name="ConversionPattern" value="%d{dd HH:mm:ss,SSS} [%-8c{2}] %-5p: %m%n"/>
+       <param name="ConversionPattern" value="%d{ISO8601} [%-8c{2}] %-5p: %m%n"/>
      </layout>	    
   </appender>
 
@@ -36,7 +36,7 @@
      <param name="MaxBackupIndex" value="10"/>
      <param name="Threshold"      value="INFO"/>
      <layout class="org.apache.log4j.PatternLayout">
-       <param name="ConversionPattern" value="%d{dd HH:mm:ss,SSS} [%-8c{2}] %-5p: %m%n"/>
+       <param name="ConversionPattern" value="%d{ISO8601} [%-8c{2}] %-5p: %m%n"/>
      </layout>	    
   </appender>
 
@@ -69,10 +69,6 @@
      <level value="INFO"/>
   </logger>
 
-  <logger name="org.apache.accumulo.examples.wikisearch">
-     <level value="INFO"/>
-  </logger>
-
   <logger name="org.mortbay.log">
      <level value="WARN"/>
   </logger>

Modified: accumulo/branches/ACCUMULO-259/conf/examples/3GB/native-standalone/log4j.properties
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/conf/examples/3GB/native-standalone/log4j.properties?rev=1391754&r1=1391753&r2=1391754&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/conf/examples/3GB/native-standalone/log4j.properties (original)
+++ accumulo/branches/ACCUMULO-259/conf/examples/3GB/native-standalone/log4j.properties Sat Sep 29 05:42:59 2012
@@ -35,5 +35,5 @@ log4j.logger.org.apache.accumulo.core.ut
 
 # Send most things to the console
 log4j.appender.A1=org.apache.log4j.ConsoleAppender
-log4j.appender.A1.layout.ConversionPattern=%d{dd HH:mm:ss,SSS} [%-8c{2}] %-5p: %m%n
+log4j.appender.A1.layout.ConversionPattern=%d{ISO8601} [%-8c{2}] %-5p: %m%n
 log4j.appender.A1.layout=org.apache.log4j.PatternLayout

Modified: accumulo/branches/ACCUMULO-259/conf/examples/3GB/native-standalone/monitor_logger.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/conf/examples/3GB/native-standalone/monitor_logger.xml?rev=1391754&r1=1391753&r2=1391754&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/conf/examples/3GB/native-standalone/monitor_logger.xml (original)
+++ accumulo/branches/ACCUMULO-259/conf/examples/3GB/native-standalone/monitor_logger.xml Sat Sep 29 05:42:59 2012
@@ -25,7 +25,7 @@
      <param name="MaxBackupIndex" value="10"/>
      <param name="Threshold"      value="DEBUG"/>
      <layout class="org.apache.log4j.PatternLayout">
-       <param name="ConversionPattern" value="%d{dd HH:mm:ss,SSS} [%-8c{2}] %-5p: %X{application} %m%n"/>
+       <param name="ConversionPattern" value="%d{ISO8601} [%-8c{2}] %-5p: %X{application} %m%n"/>
      </layout>	    
   </appender>
 
@@ -36,7 +36,7 @@
      <param name="MaxBackupIndex" value="10"/>
      <param name="Threshold"      value="INFO"/>
      <layout class="org.apache.log4j.PatternLayout">
-       <param name="ConversionPattern" value="%d{dd HH:mm:ss,SSS} [%-8c{2}] %-5p: %X{application} %m%n"/>
+       <param name="ConversionPattern" value="%d{ISO8601} [%-8c{2}] %-5p: %X{application} %m%n"/>
      </layout>	    
   </appender>
 

Modified: accumulo/branches/ACCUMULO-259/conf/examples/3GB/standalone/generic_logger.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/conf/examples/3GB/standalone/generic_logger.xml?rev=1391754&r1=1391753&r2=1391754&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/conf/examples/3GB/standalone/generic_logger.xml (original)
+++ accumulo/branches/ACCUMULO-259/conf/examples/3GB/standalone/generic_logger.xml Sat Sep 29 05:42:59 2012
@@ -25,7 +25,7 @@
      <param name="MaxBackupIndex" value="10"/>
      <param name="Threshold"      value="DEBUG"/>
      <layout class="org.apache.log4j.PatternLayout">
-       <param name="ConversionPattern" value="%d{dd HH:mm:ss,SSS} [%-8c{2}] %-5p: %m%n"/>
+       <param name="ConversionPattern" value="%d{ISO8601} [%-8c{2}] %-5p: %m%n"/>
      </layout>	    
   </appender>
 
@@ -36,7 +36,7 @@
      <param name="MaxBackupIndex" value="10"/>
      <param name="Threshold"      value="INFO"/>
      <layout class="org.apache.log4j.PatternLayout">
-       <param name="ConversionPattern" value="%d{dd HH:mm:ss,SSS} [%-8c{2}] %-5p: %m%n"/>
+       <param name="ConversionPattern" value="%d{ISO8601} [%-8c{2}] %-5p: %m%n"/>
      </layout>	    
   </appender>
 
@@ -69,10 +69,6 @@
      <level value="INFO"/>
   </logger>
 
-  <logger name="org.apache.accumulo.examples.wikisearch">
-     <level value="INFO"/>
-  </logger>
-
   <logger name="org.mortbay.log">
      <level value="WARN"/>
   </logger>

Modified: accumulo/branches/ACCUMULO-259/conf/examples/3GB/standalone/log4j.properties
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/conf/examples/3GB/standalone/log4j.properties?rev=1391754&r1=1391753&r2=1391754&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/conf/examples/3GB/standalone/log4j.properties (original)
+++ accumulo/branches/ACCUMULO-259/conf/examples/3GB/standalone/log4j.properties Sat Sep 29 05:42:59 2012
@@ -35,5 +35,5 @@ log4j.logger.org.apache.accumulo.core.ut
 
 # Send most things to the console
 log4j.appender.A1=org.apache.log4j.ConsoleAppender
-log4j.appender.A1.layout.ConversionPattern=%d{dd HH:mm:ss,SSS} [%-8c{2}] %-5p: %m%n
+log4j.appender.A1.layout.ConversionPattern=%d{ISO8601} [%-8c{2}] %-5p: %m%n
 log4j.appender.A1.layout=org.apache.log4j.PatternLayout

Modified: accumulo/branches/ACCUMULO-259/conf/examples/3GB/standalone/monitor_logger.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/conf/examples/3GB/standalone/monitor_logger.xml?rev=1391754&r1=1391753&r2=1391754&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/conf/examples/3GB/standalone/monitor_logger.xml (original)
+++ accumulo/branches/ACCUMULO-259/conf/examples/3GB/standalone/monitor_logger.xml Sat Sep 29 05:42:59 2012
@@ -25,7 +25,7 @@
      <param name="MaxBackupIndex" value="10"/>
      <param name="Threshold"      value="DEBUG"/>
      <layout class="org.apache.log4j.PatternLayout">
-       <param name="ConversionPattern" value="%d{dd HH:mm:ss,SSS} [%-8c{2}] %-5p: %X{application} %m%n"/>
+       <param name="ConversionPattern" value="%d{ISO8601} [%-8c{2}] %-5p: %X{application} %m%n"/>
      </layout>	    
   </appender>
 
@@ -36,7 +36,7 @@
      <param name="MaxBackupIndex" value="10"/>
      <param name="Threshold"      value="INFO"/>
      <layout class="org.apache.log4j.PatternLayout">
-       <param name="ConversionPattern" value="%d{dd HH:mm:ss,SSS} [%-8c{2}] %-5p: %X{application} %m%n"/>
+       <param name="ConversionPattern" value="%d{ISO8601} [%-8c{2}] %-5p: %X{application} %m%n"/>
      </layout>	    
   </appender>
 

Modified: accumulo/branches/ACCUMULO-259/conf/examples/512MB/native-standalone/generic_logger.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/conf/examples/512MB/native-standalone/generic_logger.xml?rev=1391754&r1=1391753&r2=1391754&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/conf/examples/512MB/native-standalone/generic_logger.xml (original)
+++ accumulo/branches/ACCUMULO-259/conf/examples/512MB/native-standalone/generic_logger.xml Sat Sep 29 05:42:59 2012
@@ -25,7 +25,7 @@
      <param name="MaxBackupIndex" value="10"/>
      <param name="Threshold"      value="DEBUG"/>
      <layout class="org.apache.log4j.PatternLayout">
-       <param name="ConversionPattern" value="%d{dd HH:mm:ss,SSS} [%-8c{2}] %-5p: %m%n"/>
+       <param name="ConversionPattern" value="%d{ISO8601} [%-8c{2}] %-5p: %m%n"/>
      </layout>	    
   </appender>
 
@@ -36,7 +36,7 @@
      <param name="MaxBackupIndex" value="10"/>
      <param name="Threshold"      value="INFO"/>
      <layout class="org.apache.log4j.PatternLayout">
-       <param name="ConversionPattern" value="%d{dd HH:mm:ss,SSS} [%-8c{2}] %-5p: %m%n"/>
+       <param name="ConversionPattern" value="%d{ISO8601} [%-8c{2}] %-5p: %m%n"/>
      </layout>	    
   </appender>
 
@@ -69,10 +69,6 @@
      <level value="INFO"/>
   </logger>
 
-  <logger name="org.apache.accumulo.examples.wikisearch">
-     <level value="INFO"/>
-  </logger>
-
   <logger name="org.mortbay.log">
      <level value="WARN"/>
   </logger>

Modified: accumulo/branches/ACCUMULO-259/conf/examples/512MB/native-standalone/log4j.properties
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/conf/examples/512MB/native-standalone/log4j.properties?rev=1391754&r1=1391753&r2=1391754&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/conf/examples/512MB/native-standalone/log4j.properties (original)
+++ accumulo/branches/ACCUMULO-259/conf/examples/512MB/native-standalone/log4j.properties Sat Sep 29 05:42:59 2012
@@ -35,5 +35,5 @@ log4j.logger.org.apache.accumulo.core.ut
 
 # Send most things to the console
 log4j.appender.A1=org.apache.log4j.ConsoleAppender
-log4j.appender.A1.layout.ConversionPattern=%d{dd HH:mm:ss,SSS} [%-8c{2}] %-5p: %m%n
+log4j.appender.A1.layout.ConversionPattern=%d{ISO8601} [%-8c{2}] %-5p: %m%n
 log4j.appender.A1.layout=org.apache.log4j.PatternLayout

Modified: accumulo/branches/ACCUMULO-259/conf/examples/512MB/native-standalone/monitor_logger.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/conf/examples/512MB/native-standalone/monitor_logger.xml?rev=1391754&r1=1391753&r2=1391754&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/conf/examples/512MB/native-standalone/monitor_logger.xml (original)
+++ accumulo/branches/ACCUMULO-259/conf/examples/512MB/native-standalone/monitor_logger.xml Sat Sep 29 05:42:59 2012
@@ -25,7 +25,7 @@
      <param name="MaxBackupIndex" value="10"/>
      <param name="Threshold"      value="DEBUG"/>
      <layout class="org.apache.log4j.PatternLayout">
-       <param name="ConversionPattern" value="%d{dd HH:mm:ss,SSS} [%-8c{2}] %-5p: %X{application} %m%n"/>
+       <param name="ConversionPattern" value="%d{ISO8601} [%-8c{2}] %-5p: %X{application} %m%n"/>
      </layout>	    
   </appender>
 
@@ -36,7 +36,7 @@
      <param name="MaxBackupIndex" value="10"/>
      <param name="Threshold"      value="INFO"/>
      <layout class="org.apache.log4j.PatternLayout">
-       <param name="ConversionPattern" value="%d{dd HH:mm:ss,SSS} [%-8c{2}] %-5p: %X{application} %m%n"/>
+       <param name="ConversionPattern" value="%d{ISO8601} [%-8c{2}] %-5p: %X{application} %m%n"/>
      </layout>	    
   </appender>
 

Modified: accumulo/branches/ACCUMULO-259/conf/examples/512MB/standalone/generic_logger.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/conf/examples/512MB/standalone/generic_logger.xml?rev=1391754&r1=1391753&r2=1391754&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/conf/examples/512MB/standalone/generic_logger.xml (original)
+++ accumulo/branches/ACCUMULO-259/conf/examples/512MB/standalone/generic_logger.xml Sat Sep 29 05:42:59 2012
@@ -25,7 +25,7 @@
      <param name="MaxBackupIndex" value="10"/>
      <param name="Threshold"      value="DEBUG"/>
      <layout class="org.apache.log4j.PatternLayout">
-       <param name="ConversionPattern" value="%d{dd HH:mm:ss,SSS} [%-8c{2}] %-5p: %m%n"/>
+       <param name="ConversionPattern" value="%d{ISO8601} [%-8c{2}] %-5p: %m%n"/>
      </layout>	    
   </appender>
 
@@ -36,7 +36,7 @@
      <param name="MaxBackupIndex" value="10"/>
      <param name="Threshold"      value="INFO"/>
      <layout class="org.apache.log4j.PatternLayout">
-       <param name="ConversionPattern" value="%d{dd HH:mm:ss,SSS} [%-8c{2}] %-5p: %m%n"/>
+       <param name="ConversionPattern" value="%d{ISO8601} [%-8c{2}] %-5p: %m%n"/>
      </layout>	    
   </appender>
 
@@ -69,10 +69,6 @@
      <level value="INFO"/>
   </logger>
 
-  <logger name="org.apache.accumulo.examples.wikisearch">
-     <level value="INFO"/>
-  </logger>
-
   <logger name="org.mortbay.log">
      <level value="WARN"/>
   </logger>

Modified: accumulo/branches/ACCUMULO-259/conf/examples/512MB/standalone/log4j.properties
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/conf/examples/512MB/standalone/log4j.properties?rev=1391754&r1=1391753&r2=1391754&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/conf/examples/512MB/standalone/log4j.properties (original)
+++ accumulo/branches/ACCUMULO-259/conf/examples/512MB/standalone/log4j.properties Sat Sep 29 05:42:59 2012
@@ -35,5 +35,5 @@ log4j.logger.org.apache.accumulo.core.ut
 
 # Send most things to the console
 log4j.appender.A1=org.apache.log4j.ConsoleAppender
-log4j.appender.A1.layout.ConversionPattern=%d{dd HH:mm:ss,SSS} [%-8c{2}] %-5p: %m%n
+log4j.appender.A1.layout.ConversionPattern=%d{ISO8601} [%-8c{2}] %-5p: %m%n
 log4j.appender.A1.layout=org.apache.log4j.PatternLayout

Modified: accumulo/branches/ACCUMULO-259/conf/examples/512MB/standalone/monitor_logger.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/conf/examples/512MB/standalone/monitor_logger.xml?rev=1391754&r1=1391753&r2=1391754&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/conf/examples/512MB/standalone/monitor_logger.xml (original)
+++ accumulo/branches/ACCUMULO-259/conf/examples/512MB/standalone/monitor_logger.xml Sat Sep 29 05:42:59 2012
@@ -25,7 +25,7 @@
      <param name="MaxBackupIndex" value="10"/>
      <param name="Threshold"      value="DEBUG"/>
      <layout class="org.apache.log4j.PatternLayout">
-       <param name="ConversionPattern" value="%d{dd HH:mm:ss,SSS} [%-8c{2}] %-5p: %X{application} %m%n"/>
+       <param name="ConversionPattern" value="%d{ISO8601} [%-8c{2}] %-5p: %X{application} %m%n"/>
      </layout>	    
   </appender>
 
@@ -36,7 +36,7 @@
      <param name="MaxBackupIndex" value="10"/>
      <param name="Threshold"      value="INFO"/>
      <layout class="org.apache.log4j.PatternLayout">
-       <param name="ConversionPattern" value="%d{dd HH:mm:ss,SSS} [%-8c{2}] %-5p: %X{application} %m%n"/>
+       <param name="ConversionPattern" value="%d{ISO8601} [%-8c{2}] %-5p: %X{application} %m%n"/>
      </layout>	    
   </appender>
 

Propchange: accumulo/branches/ACCUMULO-259/core/
------------------------------------------------------------------------------
  Merged /accumulo/trunk/core:r1363474-1391624
  Merged /accumulo/branches/1.4/core:r1356924-1358205,1358207-1382577,1382613,1388120,1388629
  Merged /accumulo/branches/1.4/src/core:r1364778,1365213,1382566,1382923,1388120

Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/Constants.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/Constants.java?rev=1391754&r1=1391753&r2=1391754&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/Constants.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/Constants.java Sat Sep 29 05:42:59 2012
@@ -160,36 +160,40 @@ public class Constants {
   public static final String MAPFILE_EXTENSION = "map";
   public static final String GENERATED_TABLET_DIRECTORY_PREFIX = "t-";
   
-  public static String getBaseDir(AccumuloConfiguration conf) {
+  public static final String EXPORT_METADATA_FILE = "metadata.bin";
+  public static final String EXPORT_TABLE_CONFIG_FILE = "table_config.txt";
+  public static final String EXPORT_FILE = "exportMetadata.zip";
+  public static final String EXPORT_INFO_FILE = "accumulo_export_info.txt";
+
+  public static String getBaseDir(final AccumuloConfiguration conf) {
     return conf.get(Property.INSTANCE_DFS_DIR);
   }
   
-  public static String getTablesDir(AccumuloConfiguration conf) {
+  public static String getTablesDir(final AccumuloConfiguration conf) {
     return getBaseDir(conf) + "/tables";
   }
   
-  public static String getRecoveryDir(AccumuloConfiguration conf) {
+  public static String getRecoveryDir(final AccumuloConfiguration conf) {
     return getBaseDir(conf) + "/recovery";
   }
   
-  public static Path getDataVersionLocation(AccumuloConfiguration conf) {
+  public static Path getDataVersionLocation(final AccumuloConfiguration conf) {
     return new Path(getBaseDir(conf) + "/version");
   }
   
-  public static String getMetadataTableDir(AccumuloConfiguration conf) {
+  public static String getMetadataTableDir(final AccumuloConfiguration conf) {
     return getTablesDir(conf) + "/" + METADATA_TABLE_ID;
   }
   
-  public static String getRootTabletDir(AccumuloConfiguration conf) {
+  public static String getRootTabletDir(final AccumuloConfiguration conf) {
     return getMetadataTableDir(conf) + ZROOT_TABLET;
   }
   
   /**
    * @param conf
-   * @return
+   * @return The write-ahead log directory.
    */
-  public static String getWalDirectory(AccumuloConfiguration conf) {
+  public static String getWalDirectory(final AccumuloConfiguration conf) {
     return getBaseDir(conf) + "/wal";
   }
-  
 }

Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/bloomfilter/BloomFilter.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/bloomfilter/BloomFilter.java?rev=1391754&r1=1391753&r2=1391754&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/bloomfilter/BloomFilter.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/bloomfilter/BloomFilter.java Sat Sep 29 05:42:59 2012
@@ -99,14 +99,14 @@ public class BloomFilter extends Filter 
    * @param hashType
    *          type of the hashing function (see {@link org.apache.hadoop.util.hash.Hash}).
    */
-  public BloomFilter(int vectorSize, int nbHash, int hashType) {
+  public BloomFilter(final int vectorSize, final int nbHash, final int hashType) {
     super(vectorSize, nbHash, hashType);
     
     bits = new BitSet(this.vectorSize);
   }
   
   @Override
-  public boolean add(Key key) {
+  public boolean add(final Key key) {
     if (key == null) {
       throw new NullPointerException("key cannot be null");
     }
@@ -125,7 +125,7 @@ public class BloomFilter extends Filter 
   }
   
   @Override
-  public void and(Filter filter) {
+  public void and(final Filter filter) {
     if (filter == null || !(filter instanceof BloomFilter) || filter.vectorSize != this.vectorSize || filter.nbHash != this.nbHash) {
       throw new IllegalArgumentException("filters cannot be and-ed");
     }
@@ -134,7 +134,7 @@ public class BloomFilter extends Filter 
   }
   
   @Override
-  public boolean membershipTest(Key key) {
+  public boolean membershipTest(final Key key) {
     if (key == null) {
       throw new NullPointerException("key cannot be null");
     }
@@ -155,7 +155,7 @@ public class BloomFilter extends Filter 
   }
   
   @Override
-  public void or(Filter filter) {
+  public void or(final Filter filter) {
     if (filter == null || !(filter instanceof BloomFilter) || filter.vectorSize != this.vectorSize || filter.nbHash != this.nbHash) {
       throw new IllegalArgumentException("filters cannot be or-ed");
     }
@@ -163,7 +163,7 @@ public class BloomFilter extends Filter 
   }
   
   @Override
-  public void xor(Filter filter) {
+  public void xor(final Filter filter) {
     if (filter == null || !(filter instanceof BloomFilter) || filter.vectorSize != this.vectorSize || filter.nbHash != this.nbHash) {
       throw new IllegalArgumentException("filters cannot be xor-ed");
     }
@@ -185,7 +185,7 @@ public class BloomFilter extends Filter 
   // Writable
   
   @Override
-  public void write(DataOutput out) throws IOException {
+  public void write(final DataOutput out) throws IOException {
     super.write(out);
     
     ByteArrayOutputStream boas = new ByteArrayOutputStream();
@@ -198,7 +198,7 @@ public class BloomFilter extends Filter 
   }
   
   @Override
-  public void readFields(DataInput in) throws IOException {
+  public void readFields(final DataInput in) throws IOException {
     
     super.readFields(in);
     



Mime
View raw message