accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vi...@apache.org
Subject svn commit: r1433166 [1/20] - in /accumulo/branches/ACCUMULO-259: ./ assemble/ assemble/platform/ assemble/scripts/ assemble/scripts/init.d/ bin/ conf/examples/1GB/native-standalone/ conf/examples/1GB/standalone/ conf/examples/2GB/native-standalone/ co...
Date Mon, 14 Jan 2013 22:03:34 GMT
Author: vines
Date: Mon Jan 14 22:03:24 2013
New Revision: 1433166

URL: http://svn.apache.org/viewvc?rev=1433166&view=rev
Log:
ACCUMULO-259 - Merging up to date


Added:
    accumulo/branches/ACCUMULO-259/assemble/scripts/
      - copied from r1432174, accumulo/trunk/assemble/scripts/
    accumulo/branches/ACCUMULO-259/assemble/scripts/gc-only-init.sh
      - copied unchanged from r1432174, accumulo/trunk/assemble/scripts/gc-only-init.sh
    accumulo/branches/ACCUMULO-259/assemble/scripts/init.d/
      - copied from r1432174, accumulo/trunk/assemble/scripts/init.d/
    accumulo/branches/ACCUMULO-259/assemble/scripts/init.d/accumulo-gc
      - copied unchanged from r1432174, accumulo/trunk/assemble/scripts/init.d/accumulo-gc
    accumulo/branches/ACCUMULO-259/assemble/scripts/init.d/accumulo-master
      - copied unchanged from r1432174, accumulo/trunk/assemble/scripts/init.d/accumulo-master
    accumulo/branches/ACCUMULO-259/assemble/scripts/init.d/accumulo-monitor
      - copied unchanged from r1432174, accumulo/trunk/assemble/scripts/init.d/accumulo-monitor
    accumulo/branches/ACCUMULO-259/assemble/scripts/init.d/accumulo-slave
      - copied unchanged from r1432174, accumulo/trunk/assemble/scripts/init.d/accumulo-slave
    accumulo/branches/ACCUMULO-259/assemble/scripts/init.d/accumulo-tracer
      - copied unchanged from r1432174, accumulo/trunk/assemble/scripts/init.d/accumulo-tracer
    accumulo/branches/ACCUMULO-259/assemble/scripts/init.d/accumulo-tserver
      - copied unchanged from r1432174, accumulo/trunk/assemble/scripts/init.d/accumulo-tserver
    accumulo/branches/ACCUMULO-259/assemble/scripts/master-only-init.sh
      - copied unchanged from r1432174, accumulo/trunk/assemble/scripts/master-only-init.sh
    accumulo/branches/ACCUMULO-259/assemble/scripts/monitor-only-init.sh
      - copied unchanged from r1432174, accumulo/trunk/assemble/scripts/monitor-only-init.sh
    accumulo/branches/ACCUMULO-259/assemble/scripts/slave-only-init.sh
      - copied unchanged from r1432174, accumulo/trunk/assemble/scripts/slave-only-init.sh
    accumulo/branches/ACCUMULO-259/assemble/scripts/stand-alone-init.sh
      - copied unchanged from r1432174, accumulo/trunk/assemble/scripts/stand-alone-init.sh
    accumulo/branches/ACCUMULO-259/assemble/scripts/tracer-only-init.sh
      - copied unchanged from r1432174, accumulo/trunk/assemble/scripts/tracer-only-init.sh
    accumulo/branches/ACCUMULO-259/assemble/scripts/tserver-only-init.sh
      - copied unchanged from r1432174, accumulo/trunk/assemble/scripts/tserver-only-init.sh
    accumulo/branches/ACCUMULO-259/bin/bootstrap_hdfs.sh
      - copied, changed from r1432174, accumulo/trunk/bin/bootstrap_hdfs.sh
    accumulo/branches/ACCUMULO-259/conf/examples/vfs-classloader/
      - copied from r1432174, accumulo/trunk/conf/examples/vfs-classloader/
    accumulo/branches/ACCUMULO-259/conf/examples/vfs-classloader/accumulo-site.xml
      - copied unchanged from r1432174, accumulo/trunk/conf/examples/vfs-classloader/accumulo-site.xml
    accumulo/branches/ACCUMULO-259/contrib/findbugs_build.xml
      - copied unchanged from r1432174, accumulo/trunk/contrib/findbugs_build.xml
    accumulo/branches/ACCUMULO-259/contrib/run_findbugs.sh
      - copied unchanged from r1432174, accumulo/trunk/contrib/run_findbugs.sh
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/cli/
      - copied from r1432174, accumulo/trunk/core/src/main/java/org/apache/accumulo/core/cli/
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/cli/BatchScannerOpts.java
      - copied unchanged from r1432174, accumulo/trunk/core/src/main/java/org/apache/accumulo/core/cli/BatchScannerOpts.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/cli/BatchWriterOpts.java
      - copied unchanged from r1432174, accumulo/trunk/core/src/main/java/org/apache/accumulo/core/cli/BatchWriterOpts.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/cli/ClientOnDefaultTable.java
      - copied unchanged from r1432174, accumulo/trunk/core/src/main/java/org/apache/accumulo/core/cli/ClientOnDefaultTable.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/cli/ClientOnRequiredTable.java
      - copied unchanged from r1432174, accumulo/trunk/core/src/main/java/org/apache/accumulo/core/cli/ClientOnRequiredTable.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java
      - copied unchanged from r1432174, accumulo/trunk/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/cli/Help.java
      - copied unchanged from r1432174, accumulo/trunk/core/src/main/java/org/apache/accumulo/core/cli/Help.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/cli/ScannerOpts.java
      - copied unchanged from r1432174, accumulo/trunk/core/src/main/java/org/apache/accumulo/core/cli/ScannerOpts.java
    accumulo/branches/ACCUMULO-259/core/src/main/scripts/
      - copied from r1432174, accumulo/trunk/core/src/main/scripts/
    accumulo/branches/ACCUMULO-259/core/src/main/scripts/generate-thrift.sh
      - copied unchanged from r1432174, accumulo/trunk/core/src/main/scripts/generate-thrift.sh
    accumulo/branches/ACCUMULO-259/core/src/test/java/org/apache/accumulo/core/cli/
      - copied from r1432174, accumulo/trunk/core/src/test/java/org/apache/accumulo/core/cli/
    accumulo/branches/ACCUMULO-259/core/src/test/java/org/apache/accumulo/core/cli/TestClientOpts.java
      - copied unchanged from r1432174, accumulo/trunk/core/src/test/java/org/apache/accumulo/core/cli/TestClientOpts.java
    accumulo/branches/ACCUMULO-259/core/src/test/java/org/apache/accumulo/core/file/BloomFilterLayerLookupTest.java
      - copied unchanged from r1432174, accumulo/trunk/core/src/test/java/org/apache/accumulo/core/file/BloomFilterLayerLookupTest.java
    accumulo/branches/ACCUMULO-259/core/src/test/java/org/apache/accumulo/core/file/rfile/BlockIndexTest.java
      - copied unchanged from r1432174, accumulo/trunk/core/src/test/java/org/apache/accumulo/core/file/rfile/BlockIndexTest.java
    accumulo/branches/ACCUMULO-259/core/src/test/java/org/apache/accumulo/core/iterators/system/VisibilityFilterTest.java
      - copied unchanged from r1432174, accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/system/VisibilityFilterTest.java
    accumulo/branches/ACCUMULO-259/core/src/test/resources/disabled/
      - copied from r1432174, accumulo/trunk/core/src/test/resources/disabled/
    accumulo/branches/ACCUMULO-259/core/src/test/resources/disabled/conf/
      - copied from r1432174, accumulo/trunk/core/src/test/resources/disabled/conf/
    accumulo/branches/ACCUMULO-259/core/src/test/resources/disabled/conf/accumulo-site.xml
      - copied unchanged from r1432174, accumulo/trunk/core/src/test/resources/disabled/conf/accumulo-site.xml
    accumulo/branches/ACCUMULO-259/core/src/test/resources/org/apache/accumulo/core/file/rfile/ver_6.rf
      - copied unchanged from r1432174, accumulo/trunk/core/src/test/resources/org/apache/accumulo/core/file/rfile/ver_6.rf
    accumulo/branches/ACCUMULO-259/docs/examples/README.client
      - copied unchanged from r1433134, accumulo/trunk/docs/examples/README.client
    accumulo/branches/ACCUMULO-259/docs/examples/README.regex
      - copied unchanged from r1432174, accumulo/trunk/docs/examples/README.regex
    accumulo/branches/ACCUMULO-259/docs/examples/README.rowhash
      - copied unchanged from r1432174, accumulo/trunk/docs/examples/README.rowhash
    accumulo/branches/ACCUMULO-259/docs/examples/README.tabletofile
      - copied unchanged from r1432174, accumulo/trunk/docs/examples/README.tabletofile
    accumulo/branches/ACCUMULO-259/docs/examples/README.terasort
      - copied unchanged from r1432174, accumulo/trunk/docs/examples/README.terasort
    accumulo/branches/ACCUMULO-259/examples/instamo/   (props changed)
      - copied from r1432174, accumulo/trunk/examples/instamo/
    accumulo/branches/ACCUMULO-259/examples/instamo/README.md
      - copied unchanged from r1432174, accumulo/trunk/examples/instamo/README.md
    accumulo/branches/ACCUMULO-259/examples/instamo/pom.xml
      - copied unchanged from r1432174, accumulo/trunk/examples/instamo/pom.xml
    accumulo/branches/ACCUMULO-259/examples/instamo/src/
      - copied from r1432174, accumulo/trunk/examples/instamo/src/
    accumulo/branches/ACCUMULO-259/examples/instamo/src/main/
      - copied from r1432174, accumulo/trunk/examples/instamo/src/main/
    accumulo/branches/ACCUMULO-259/examples/instamo/src/main/java/
      - copied from r1432174, accumulo/trunk/examples/instamo/src/main/java/
    accumulo/branches/ACCUMULO-259/examples/instamo/src/main/java/org/
      - copied from r1432174, accumulo/trunk/examples/instamo/src/main/java/org/
    accumulo/branches/ACCUMULO-259/examples/instamo/src/main/java/org/apache/
      - copied from r1432174, accumulo/trunk/examples/instamo/src/main/java/org/apache/
    accumulo/branches/ACCUMULO-259/examples/instamo/src/main/java/org/apache/accumulo/
      - copied from r1432174, accumulo/trunk/examples/instamo/src/main/java/org/apache/accumulo/
    accumulo/branches/ACCUMULO-259/examples/instamo/src/main/java/org/apache/accumulo/instamo/
      - copied from r1432174, accumulo/trunk/examples/instamo/src/main/java/org/apache/accumulo/instamo/
    accumulo/branches/ACCUMULO-259/examples/instamo/src/main/java/org/apache/accumulo/instamo/AccumuloApp.java
      - copied unchanged from r1432174, accumulo/trunk/examples/instamo/src/main/java/org/apache/accumulo/instamo/AccumuloApp.java
    accumulo/branches/ACCUMULO-259/examples/instamo/src/main/java/org/apache/accumulo/instamo/MapReduceExample.java
      - copied, changed from r1432174, accumulo/trunk/examples/instamo/src/main/java/org/apache/accumulo/instamo/MapReduceExample.java
    accumulo/branches/ACCUMULO-259/examples/instamo/src/main/resources/
      - copied from r1432174, accumulo/trunk/examples/instamo/src/main/resources/
    accumulo/branches/ACCUMULO-259/examples/instamo/src/main/resources/log4j.properties
      - copied unchanged from r1432174, accumulo/trunk/examples/instamo/src/main/resources/log4j.properties
    accumulo/branches/ACCUMULO-259/examples/instamo/src/test/
      - copied from r1432174, accumulo/trunk/examples/instamo/src/test/
    accumulo/branches/ACCUMULO-259/examples/instamo/src/test/java/
      - copied from r1432174, accumulo/trunk/examples/instamo/src/test/java/
    accumulo/branches/ACCUMULO-259/examples/instamo/src/test/java/org/
      - copied from r1432174, accumulo/trunk/examples/instamo/src/test/java/org/
    accumulo/branches/ACCUMULO-259/examples/instamo/src/test/java/org/apache/
      - copied from r1432174, accumulo/trunk/examples/instamo/src/test/java/org/apache/
    accumulo/branches/ACCUMULO-259/examples/instamo/src/test/java/org/apache/accumulo/
      - copied from r1432174, accumulo/trunk/examples/instamo/src/test/java/org/apache/accumulo/
    accumulo/branches/ACCUMULO-259/examples/instamo/src/test/java/org/apache/accumulo/instamo/
      - copied from r1432174, accumulo/trunk/examples/instamo/src/test/java/org/apache/accumulo/instamo/
    accumulo/branches/ACCUMULO-259/examples/instamo/src/test/java/org/apache/accumulo/instamo/ExampleAccumuloUnitTest.java
      - copied, changed from r1432174, accumulo/trunk/examples/instamo/src/test/java/org/apache/accumulo/instamo/ExampleAccumuloUnitTest.java
    accumulo/branches/ACCUMULO-259/fate/src/main/java/org/apache/accumulo/fate/AgeOffStore.java
      - copied unchanged from r1432174, accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/AgeOffStore.java
    accumulo/branches/ACCUMULO-259/fate/src/test/java/org/apache/accumulo/fate/AgeOffStoreTest.java
      - copied unchanged from r1432174, accumulo/trunk/fate/src/test/java/org/apache/accumulo/fate/AgeOffStoreTest.java
    accumulo/branches/ACCUMULO-259/fate/src/test/java/org/apache/accumulo/fate/SimpleStore.java
      - copied unchanged from r1432174, accumulo/trunk/fate/src/test/java/org/apache/accumulo/fate/SimpleStore.java
    accumulo/branches/ACCUMULO-259/fate/src/test/resources/
      - copied from r1433134, accumulo/trunk/fate/src/test/resources/
    accumulo/branches/ACCUMULO-259/fate/src/test/resources/log4j.properties
      - copied unchanged from r1433134, accumulo/trunk/fate/src/test/resources/log4j.properties
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/cli/
      - copied from r1432174, accumulo/trunk/server/src/main/java/org/apache/accumulo/server/cli/
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/cli/ClientOnDefaultTable.java
      - copied unchanged from r1432174, accumulo/trunk/server/src/main/java/org/apache/accumulo/server/cli/ClientOnDefaultTable.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/cli/ClientOnRequiredTable.java
      - copied unchanged from r1432174, accumulo/trunk/server/src/main/java/org/apache/accumulo/server/cli/ClientOnRequiredTable.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/cli/ClientOpts.java
      - copied unchanged from r1432174, accumulo/trunk/server/src/main/java/org/apache/accumulo/server/cli/ClientOpts.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/recovery/MapRRecoverLease.java
      - copied unchanged from r1432174, accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/recovery/MapRRecoverLease.java
    accumulo/branches/ACCUMULO-259/server/src/test/java/org/apache/accumulo/server/monitor/
      - copied from r1432174, accumulo/trunk/server/src/test/java/org/apache/accumulo/server/monitor/
    accumulo/branches/ACCUMULO-259/server/src/test/java/org/apache/accumulo/server/monitor/ZooKeeperStatusTest.java
      - copied unchanged from r1432174, accumulo/trunk/server/src/test/java/org/apache/accumulo/server/monitor/ZooKeeperStatusTest.java
    accumulo/branches/ACCUMULO-259/start/src/main/java/org/apache/accumulo/start/classloader/vfs/
      - copied from r1432174, accumulo/trunk/start/src/main/java/org/apache/accumulo/start/classloader/vfs/
    accumulo/branches/ACCUMULO-259/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloReloadingVFSClassLoader.java
      - copied unchanged from r1432174, accumulo/trunk/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloReloadingVFSClassLoader.java
    accumulo/branches/ACCUMULO-259/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloVFSClassLoader.java
      - copied unchanged from r1432174, accumulo/trunk/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloVFSClassLoader.java
    accumulo/branches/ACCUMULO-259/start/src/main/java/org/apache/accumulo/start/classloader/vfs/ContextManager.java
      - copied unchanged from r1432174, accumulo/trunk/start/src/main/java/org/apache/accumulo/start/classloader/vfs/ContextManager.java
    accumulo/branches/ACCUMULO-259/start/src/main/java/org/apache/accumulo/start/classloader/vfs/PostDelegatingVFSClassLoader.java
      - copied unchanged from r1432174, accumulo/trunk/start/src/main/java/org/apache/accumulo/start/classloader/vfs/PostDelegatingVFSClassLoader.java
    accumulo/branches/ACCUMULO-259/start/src/main/java/org/apache/accumulo/start/classloader/vfs/ReloadingClassLoader.java
      - copied unchanged from r1432174, accumulo/trunk/start/src/main/java/org/apache/accumulo/start/classloader/vfs/ReloadingClassLoader.java
    accumulo/branches/ACCUMULO-259/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/
      - copied from r1432174, accumulo/trunk/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/
    accumulo/branches/ACCUMULO-259/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsFileAttributes.java
      - copied unchanged from r1432174, accumulo/trunk/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsFileAttributes.java
    accumulo/branches/ACCUMULO-259/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsFileContentInfoFactory.java
      - copied unchanged from r1432174, accumulo/trunk/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsFileContentInfoFactory.java
    accumulo/branches/ACCUMULO-259/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsFileObject.java
      - copied unchanged from r1432174, accumulo/trunk/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsFileObject.java
    accumulo/branches/ACCUMULO-259/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsFileProvider.java
      - copied unchanged from r1432174, accumulo/trunk/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsFileProvider.java
    accumulo/branches/ACCUMULO-259/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsFileSystem.java
      - copied unchanged from r1432174, accumulo/trunk/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsFileSystem.java
    accumulo/branches/ACCUMULO-259/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsFileSystemConfigBuilder.java
      - copied unchanged from r1432174, accumulo/trunk/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsFileSystemConfigBuilder.java
    accumulo/branches/ACCUMULO-259/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsRandomAccessContent.java
      - copied unchanged from r1432174, accumulo/trunk/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsRandomAccessContent.java
    accumulo/branches/ACCUMULO-259/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/package.html
      - copied unchanged from r1432174, accumulo/trunk/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/package.html
    accumulo/branches/ACCUMULO-259/start/src/main/java/org/apache/commons/
      - copied from r1432174, accumulo/trunk/start/src/main/java/org/apache/commons/
    accumulo/branches/ACCUMULO-259/start/src/main/java/org/apache/commons/vfs2/
      - copied from r1432174, accumulo/trunk/start/src/main/java/org/apache/commons/vfs2/
    accumulo/branches/ACCUMULO-259/start/src/main/java/org/apache/commons/vfs2/provider/
      - copied from r1432174, accumulo/trunk/start/src/main/java/org/apache/commons/vfs2/provider/
    accumulo/branches/ACCUMULO-259/start/src/main/java/org/apache/commons/vfs2/provider/hdfs/
      - copied from r1432174, accumulo/trunk/start/src/main/java/org/apache/commons/vfs2/provider/hdfs/
    accumulo/branches/ACCUMULO-259/start/src/test/java/org/apache/accumulo/start/classloader/
      - copied from r1432174, accumulo/trunk/start/src/test/java/org/apache/accumulo/start/classloader/
    accumulo/branches/ACCUMULO-259/start/src/test/java/org/apache/accumulo/start/classloader/vfs/
      - copied from r1432174, accumulo/trunk/start/src/test/java/org/apache/accumulo/start/classloader/vfs/
    accumulo/branches/ACCUMULO-259/start/src/test/java/org/apache/accumulo/start/classloader/vfs/AccumuloReloadingVFSClassLoaderTest.java
      - copied unchanged from r1432174, accumulo/trunk/start/src/test/java/org/apache/accumulo/start/classloader/vfs/AccumuloReloadingVFSClassLoaderTest.java
    accumulo/branches/ACCUMULO-259/start/src/test/java/org/apache/accumulo/start/classloader/vfs/AccumuloVFSClassLoaderTest.java
      - copied unchanged from r1432174, accumulo/trunk/start/src/test/java/org/apache/accumulo/start/classloader/vfs/AccumuloVFSClassLoaderTest.java
    accumulo/branches/ACCUMULO-259/start/src/test/java/org/apache/accumulo/start/classloader/vfs/ContextManagerTest.java
      - copied unchanged from r1432174, accumulo/trunk/start/src/test/java/org/apache/accumulo/start/classloader/vfs/ContextManagerTest.java
    accumulo/branches/ACCUMULO-259/start/src/test/java/org/apache/accumulo/start/classloader/vfs/providers/
      - copied from r1432174, accumulo/trunk/start/src/test/java/org/apache/accumulo/start/classloader/vfs/providers/
    accumulo/branches/ACCUMULO-259/start/src/test/java/org/apache/accumulo/start/classloader/vfs/providers/ReadOnlyHdfsFileProviderTest.java
      - copied unchanged from r1432174, accumulo/trunk/start/src/test/java/org/apache/accumulo/start/classloader/vfs/providers/ReadOnlyHdfsFileProviderTest.java
    accumulo/branches/ACCUMULO-259/start/src/test/java/org/apache/accumulo/start/classloader/vfs/providers/VfsClassLoaderTest.java
      - copied unchanged from r1432174, accumulo/trunk/start/src/test/java/org/apache/accumulo/start/classloader/vfs/providers/VfsClassLoaderTest.java
    accumulo/branches/ACCUMULO-259/start/src/test/java/org/apache/accumulo/test/
      - copied from r1432174, accumulo/trunk/start/src/test/java/org/apache/accumulo/test/
    accumulo/branches/ACCUMULO-259/start/src/test/java/org/apache/accumulo/test/AccumuloDFSBase.java
      - copied unchanged from r1432174, accumulo/trunk/start/src/test/java/org/apache/accumulo/test/AccumuloDFSBase.java
    accumulo/branches/ACCUMULO-259/start/src/test/java/org/apache/commons/
      - copied from r1432174, accumulo/trunk/start/src/test/java/org/apache/commons/
    accumulo/branches/ACCUMULO-259/start/src/test/resources/HelloWorld.jar
      - copied unchanged from r1432174, accumulo/trunk/start/src/test/resources/HelloWorld.jar
    accumulo/branches/ACCUMULO-259/test/pom.xml
      - copied unchanged from r1432174, accumulo/trunk/test/pom.xml
    accumulo/branches/ACCUMULO-259/test/src/
      - copied from r1432174, accumulo/trunk/test/src/
    accumulo/branches/ACCUMULO-259/test/src/main/
      - copied from r1432174, accumulo/trunk/test/src/main/
    accumulo/branches/ACCUMULO-259/test/src/main/java/
      - copied from r1432174, accumulo/trunk/test/src/main/java/
    accumulo/branches/ACCUMULO-259/test/src/main/java/org/
      - copied from r1432174, accumulo/trunk/test/src/main/java/org/
    accumulo/branches/ACCUMULO-259/test/src/main/java/org/apache/
      - copied from r1432174, accumulo/trunk/test/src/main/java/org/apache/
    accumulo/branches/ACCUMULO-259/test/src/main/java/org/apache/accumulo/
      - copied from r1432174, accumulo/trunk/test/src/main/java/org/apache/accumulo/
    accumulo/branches/ACCUMULO-259/test/src/main/java/org/apache/accumulo/test/
      - copied from r1432174, accumulo/trunk/test/src/main/java/org/apache/accumulo/test/
    accumulo/branches/ACCUMULO-259/test/src/main/java/org/apache/accumulo/test/MacConfig.java
      - copied unchanged from r1433134, accumulo/trunk/test/src/main/java/org/apache/accumulo/test/MacConfig.java
    accumulo/branches/ACCUMULO-259/test/src/main/java/org/apache/accumulo/test/MiniAccumuloCluster.java
      - copied, changed from r1432174, accumulo/trunk/test/src/main/java/org/apache/accumulo/test/MiniAccumuloCluster.java
    accumulo/branches/ACCUMULO-259/test/src/test/
      - copied from r1432174, accumulo/trunk/test/src/test/
    accumulo/branches/ACCUMULO-259/test/src/test/java/
      - copied from r1432174, accumulo/trunk/test/src/test/java/
    accumulo/branches/ACCUMULO-259/test/src/test/java/org/
      - copied from r1432174, accumulo/trunk/test/src/test/java/org/
    accumulo/branches/ACCUMULO-259/test/src/test/java/org/apache/
      - copied from r1432174, accumulo/trunk/test/src/test/java/org/apache/
    accumulo/branches/ACCUMULO-259/test/src/test/java/org/apache/accumulo/
      - copied from r1432174, accumulo/trunk/test/src/test/java/org/apache/accumulo/
    accumulo/branches/ACCUMULO-259/test/src/test/java/org/apache/accumulo/test/
      - copied from r1432174, accumulo/trunk/test/src/test/java/org/apache/accumulo/test/
    accumulo/branches/ACCUMULO-259/test/src/test/java/org/apache/accumulo/test/MiniAccumuloClusterTest.java
      - copied, changed from r1432174, accumulo/trunk/test/src/test/java/org/apache/accumulo/test/MiniAccumuloClusterTest.java
    accumulo/branches/ACCUMULO-259/test/src/test/resources/
      - copied from r1432174, accumulo/trunk/test/src/test/resources/
    accumulo/branches/ACCUMULO-259/test/src/test/resources/FooFilter.jar
      - copied unchanged from r1432174, accumulo/trunk/test/src/test/resources/FooFilter.jar
    accumulo/branches/ACCUMULO-259/test/src/test/resources/conf/
      - copied from r1432174, accumulo/trunk/test/src/test/resources/conf/
    accumulo/branches/ACCUMULO-259/test/src/test/resources/conf/accumulo-site.xml
      - copied unchanged from r1432174, accumulo/trunk/test/src/test/resources/conf/accumulo-site.xml
    accumulo/branches/ACCUMULO-259/test/src/test/resources/lib/
      - copied from r1432174, accumulo/trunk/test/src/test/resources/lib/
    accumulo/branches/ACCUMULO-259/test/src/test/resources/lib/ext/
      - copied from r1432174, accumulo/trunk/test/src/test/resources/lib/ext/
    accumulo/branches/ACCUMULO-259/trace/src/main/scripts/
      - copied from r1432174, accumulo/trunk/trace/src/main/scripts/
    accumulo/branches/ACCUMULO-259/trace/src/main/scripts/generate-thrift.sh
      - copied unchanged from r1432174, accumulo/trunk/trace/src/main/scripts/generate-thrift.sh
Removed:
    accumulo/branches/ACCUMULO-259/assemble/platform/
    accumulo/branches/ACCUMULO-259/core/src/main/thrift/thrift.sh
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/tabletserver/EncodedBinaryTreePath.java
    accumulo/branches/ACCUMULO-259/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloFilesystemAlterationMonitor.java
    accumulo/branches/ACCUMULO-259/start/src/test/java/org/apache/accumulo/start/Test.java
    accumulo/branches/ACCUMULO-259/test/system/test5/
    accumulo/branches/ACCUMULO-259/trace/thrift.sh
Modified:
    accumulo/branches/ACCUMULO-259/   (props changed)
    accumulo/branches/ACCUMULO-259/.gitignore
    accumulo/branches/ACCUMULO-259/LICENSE
    accumulo/branches/ACCUMULO-259/README
    accumulo/branches/ACCUMULO-259/assemble/   (props changed)
    accumulo/branches/ACCUMULO-259/assemble/dist.xml
    accumulo/branches/ACCUMULO-259/assemble/pom.xml
    accumulo/branches/ACCUMULO-259/bin/accumulo
    accumulo/branches/ACCUMULO-259/bin/config.sh
    accumulo/branches/ACCUMULO-259/bin/start-server.sh
    accumulo/branches/ACCUMULO-259/bin/stop-server.sh
    accumulo/branches/ACCUMULO-259/bin/tool.sh
    accumulo/branches/ACCUMULO-259/conf/examples/1GB/native-standalone/accumulo-env.sh
    accumulo/branches/ACCUMULO-259/conf/examples/1GB/native-standalone/accumulo-site.xml
    accumulo/branches/ACCUMULO-259/conf/examples/1GB/native-standalone/log4j.properties
    accumulo/branches/ACCUMULO-259/conf/examples/1GB/standalone/accumulo-env.sh
    accumulo/branches/ACCUMULO-259/conf/examples/1GB/standalone/accumulo-site.xml
    accumulo/branches/ACCUMULO-259/conf/examples/1GB/standalone/log4j.properties
    accumulo/branches/ACCUMULO-259/conf/examples/2GB/native-standalone/accumulo-env.sh
    accumulo/branches/ACCUMULO-259/conf/examples/2GB/native-standalone/accumulo-site.xml
    accumulo/branches/ACCUMULO-259/conf/examples/2GB/native-standalone/log4j.properties
    accumulo/branches/ACCUMULO-259/conf/examples/2GB/standalone/accumulo-env.sh
    accumulo/branches/ACCUMULO-259/conf/examples/2GB/standalone/accumulo-site.xml
    accumulo/branches/ACCUMULO-259/conf/examples/2GB/standalone/log4j.properties
    accumulo/branches/ACCUMULO-259/conf/examples/3GB/native-standalone/accumulo-env.sh
    accumulo/branches/ACCUMULO-259/conf/examples/3GB/native-standalone/accumulo-site.xml
    accumulo/branches/ACCUMULO-259/conf/examples/3GB/native-standalone/log4j.properties
    accumulo/branches/ACCUMULO-259/conf/examples/3GB/standalone/accumulo-env.sh
    accumulo/branches/ACCUMULO-259/conf/examples/3GB/standalone/accumulo-site.xml
    accumulo/branches/ACCUMULO-259/conf/examples/3GB/standalone/log4j.properties
    accumulo/branches/ACCUMULO-259/conf/examples/512MB/native-standalone/accumulo-env.sh
    accumulo/branches/ACCUMULO-259/conf/examples/512MB/native-standalone/accumulo-site.xml
    accumulo/branches/ACCUMULO-259/conf/examples/512MB/native-standalone/log4j.properties
    accumulo/branches/ACCUMULO-259/conf/examples/512MB/standalone/accumulo-env.sh
    accumulo/branches/ACCUMULO-259/conf/examples/512MB/standalone/accumulo-site.xml
    accumulo/branches/ACCUMULO-259/conf/examples/512MB/standalone/log4j.properties
    accumulo/branches/ACCUMULO-259/core/   (props changed)
    accumulo/branches/ACCUMULO-259/core/pom.xml
    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/client/BatchWriter.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/BatchWriterConfig.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/IsolatedScanner.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/MutationsRejectedException.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/admin/ActiveScan.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/admin/SecurityOperations.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/admin/SecurityOperationsImpl.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/ConnectorImpl.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/ServerClient.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/TabletLocator.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/TabletLocatorImpl.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/ThriftScanner.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftTransportPool.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/Writer.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/impl/thrift/ThriftTest.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/mapreduce/lib/partition/KeyRangePartitioner.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitioner.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/MockInstance.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mock/MockInstanceOperations.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/MockSecurityOperations.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mock/MockShell.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mock/MockTable.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/Property.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/ArrayByteSequence.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/Mutation.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/blockfile/impl/CachableBlockFile.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/MultiLevelIndex.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/file/rfile/PrintInfo.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/SplitLarge.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/BoundedRangeFileInputStream.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/AggregatingIterator.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/ColumnFamilyCounter.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/IteratorUtil.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/LongCombiner.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/TypedValueCombiner.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/StringMax.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/StringMin.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/StringSummation.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/conf/ColumnSet.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/conf/ColumnToClassMapping.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/system/SourceSwitchingIterator.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/system/VisibilityFilter.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/user/GrepIterator.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/user/IntersectingIterator.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/user/LargeRowFilter.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/user/RegExFilter.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/user/RowDeletingIterator.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/user/SummingArrayCombiner.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/user/SummingCombiner.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/user/TimestampFilter.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/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/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/InstanceUserPassword.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/trace/TraceDump.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/ByteArraySet.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/Encoding.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/LocalityGroupUtil.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/LoggingRunnable.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/ServerServices.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/SimpleThreadPool.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/TextUtil.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/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/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/HiddenCommand.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/MergeCommand.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/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/SetIterCommand.java
    accumulo/branches/ACCUMULO-259/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/util/shell/commands/UserCommand.java
    accumulo/branches/ACCUMULO-259/core/src/main/thrift/client.thrift
    accumulo/branches/ACCUMULO-259/core/src/main/thrift/data.thrift
    accumulo/branches/ACCUMULO-259/core/src/main/thrift/gc.thrift
    accumulo/branches/ACCUMULO-259/core/src/main/thrift/master.thrift
    accumulo/branches/ACCUMULO-259/core/src/main/thrift/security.thrift
    accumulo/branches/ACCUMULO-259/core/src/main/thrift/tabletserver.thrift
    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/lib/partition/RangePartitionerTest.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/client/mock/MockTableOperationsTest.java
    accumulo/branches/ACCUMULO-259/core/src/test/java/org/apache/accumulo/core/conf/PropertyTest.java
    accumulo/branches/ACCUMULO-259/core/src/test/java/org/apache/accumulo/core/data/MutationTest.java
    accumulo/branches/ACCUMULO-259/core/src/test/java/org/apache/accumulo/core/file/rfile/MultiLevelIndexTest.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/file/rfile/RelativeKeyTest.java
    accumulo/branches/ACCUMULO-259/core/src/test/java/org/apache/accumulo/core/iterators/user/CombinerTest.java
    accumulo/branches/ACCUMULO-259/core/src/test/java/org/apache/accumulo/core/iterators/user/FilterTest.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/RegExFilterTest.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/util/LocalityGroupUtilTest.java
    accumulo/branches/ACCUMULO-259/core/src/test/java/org/apache/accumulo/core/util/shell/command/FormatterCommandTest.java
    accumulo/branches/ACCUMULO-259/docs/examples/README.batch
    accumulo/branches/ACCUMULO-259/docs/examples/README.bloom
    accumulo/branches/ACCUMULO-259/docs/examples/README.bulkIngest
    accumulo/branches/ACCUMULO-259/docs/examples/README.dirlist
    accumulo/branches/ACCUMULO-259/docs/examples/README.filedata
    accumulo/branches/ACCUMULO-259/docs/examples/README.helloworld
    accumulo/branches/ACCUMULO-259/docs/examples/README.isolation
    accumulo/branches/ACCUMULO-259/docs/examples/README.mapred
    accumulo/branches/ACCUMULO-259/docs/examples/README.maxmutation
    accumulo/branches/ACCUMULO-259/docs/examples/README.shard
    accumulo/branches/ACCUMULO-259/docs/examples/README.visibility
    accumulo/branches/ACCUMULO-259/examples/   (props changed)
    accumulo/branches/ACCUMULO-259/examples/pom.xml
    accumulo/branches/ACCUMULO-259/examples/simple/   (props changed)
    accumulo/branches/ACCUMULO-259/examples/simple/pom.xml
    accumulo/branches/ACCUMULO-259/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/Flush.java
    accumulo/branches/ACCUMULO-259/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchScanner.java
    accumulo/branches/ACCUMULO-259/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchWriter.java
    accumulo/branches/ACCUMULO-259/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/ReadWriteExample.java
    accumulo/branches/ACCUMULO-259/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RowOperations.java
    accumulo/branches/ACCUMULO-259/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/SequentialBatchWriter.java
    accumulo/branches/ACCUMULO-259/examples/simple/src/main/java/org/apache/accumulo/examples/simple/dirlist/FileCount.java
    accumulo/branches/ACCUMULO-259/examples/simple/src/main/java/org/apache/accumulo/examples/simple/dirlist/Ingest.java
    accumulo/branches/ACCUMULO-259/examples/simple/src/main/java/org/apache/accumulo/examples/simple/dirlist/QueryUtil.java
    accumulo/branches/ACCUMULO-259/examples/simple/src/main/java/org/apache/accumulo/examples/simple/dirlist/Viewer.java
    accumulo/branches/ACCUMULO-259/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/CharacterHistogram.java
    accumulo/branches/ACCUMULO-259/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/FileDataIngest.java
    accumulo/branches/ACCUMULO-259/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/FileDataQuery.java
    accumulo/branches/ACCUMULO-259/examples/simple/src/main/java/org/apache/accumulo/examples/simple/helloworld/InsertWithBatchWriter.java
    accumulo/branches/ACCUMULO-259/examples/simple/src/main/java/org/apache/accumulo/examples/simple/helloworld/InsertWithOutputFormat.java
    accumulo/branches/ACCUMULO-259/examples/simple/src/main/java/org/apache/accumulo/examples/simple/helloworld/ReadData.java
    accumulo/branches/ACCUMULO-259/examples/simple/src/main/java/org/apache/accumulo/examples/simple/isolation/InterferenceTest.java
    accumulo/branches/ACCUMULO-259/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/RegexExample.java
    accumulo/branches/ACCUMULO-259/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/RowHash.java
    accumulo/branches/ACCUMULO-259/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TableToFile.java
    accumulo/branches/ACCUMULO-259/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TeraSortIngest.java
    accumulo/branches/ACCUMULO-259/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/UniqueColumns.java
    accumulo/branches/ACCUMULO-259/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/WordCount.java
    accumulo/branches/ACCUMULO-259/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/bulk/BulkIngestExample.java
    accumulo/branches/ACCUMULO-259/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/bulk/GenerateTestData.java
    accumulo/branches/ACCUMULO-259/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/bulk/SetupTable.java
    accumulo/branches/ACCUMULO-259/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/bulk/VerifyIngest.java
    accumulo/branches/ACCUMULO-259/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shard/ContinuousQuery.java
    accumulo/branches/ACCUMULO-259/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shard/Index.java
    accumulo/branches/ACCUMULO-259/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shard/Query.java
    accumulo/branches/ACCUMULO-259/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shard/Reverse.java
    accumulo/branches/ACCUMULO-259/examples/simple/src/test/java/org/apache/accumulo/examples/simple/dirlist/CountTest.java
    accumulo/branches/ACCUMULO-259/fate/   (props changed)
    accumulo/branches/ACCUMULO-259/fate/pom.xml
    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/TStore.java
    accumulo/branches/ACCUMULO-259/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java   (contents, props changed)
    accumulo/branches/ACCUMULO-259/fate/src/main/java/org/apache/accumulo/fate/util/LoggingRunnable.java
    accumulo/branches/ACCUMULO-259/fate/src/main/java/org/apache/accumulo/fate/zookeeper/DistributedReadWriteLock.java
    accumulo/branches/ACCUMULO-259/fate/src/main/java/org/apache/accumulo/fate/zookeeper/IZooReader.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/ZooReservation.java
    accumulo/branches/ACCUMULO-259/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java   (props changed)
    accumulo/branches/ACCUMULO-259/fate/src/test/java/org/apache/accumulo/fate/zookeeper/DistributedReadWriteLockTest.java
    accumulo/branches/ACCUMULO-259/fate/src/test/java/org/apache/accumulo/fate/zookeeper/TransactionWatcherTest.java
    accumulo/branches/ACCUMULO-259/packages/   (props changed)
    accumulo/branches/ACCUMULO-259/packages/deb/accumulo-native/postinst
    accumulo/branches/ACCUMULO-259/packages/deb/accumulo/control
    accumulo/branches/ACCUMULO-259/packages/deb/accumulo/postinst
    accumulo/branches/ACCUMULO-259/pom.xml
    accumulo/branches/ACCUMULO-259/server/   (props changed)
    accumulo/branches/ACCUMULO-259/server/pom.xml
    accumulo/branches/ACCUMULO-259/server/src/main/c++/nativeMap/   (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/client/ClientServiceHandler.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/conf/ServerConfiguration.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/conf/ZooConfiguration.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/constraints/ConstraintLoader.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/fate/Admin.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/logger/LogReader.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/balancer/TableLoadBalancer.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/recovery/RecoverLease.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/DeadServerList.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/state/MergeStats.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/state/SetGoalState.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/state/TServerInstance.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/ZooTabletStateStore.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/CreateTable.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/tableOps/DeleteTable.java
    accumulo/branches/ACCUMULO-259/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
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/tableOps/RenameTable.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/master/tableOps/Utils.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/tserverOps/ShutdownTServer.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/metanalysis/FindTablet.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/metanalysis/IndexMeta.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/metanalysis/PrintEvents.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/metrics/MetricsConfiguration.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/monitor/Monitor.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/monitor/ZooKeeperStatus.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/monitor/servlets/DefaultServlet.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/monitor/servlets/JSONServlet.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/monitor/servlets/TServersServlet.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/monitor/servlets/XMLServlet.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/monitor/servlets/trace/Basic.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/util/celltypes/CompactionsType.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/monitor/util/celltypes/TableStateType.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/problems/ProblemReports.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/security/SecurityConstants.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/tabletserver/InMemoryMap.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/tabletserver/NativeMap.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/TabletServerResourceManager.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletStatsKeeper.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/tabletserver/UniqueNameAllocator.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/tabletserver/log/DfsLogger.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/tabletserver/log/LogSorter.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/tabletserver/log/SortedLogRecovery.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/tabletserver/log/TabletServerLogger.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/BulkImportDirectory.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/CreateRFiles.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/CreateRandomRFile.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/GCLotsOfCandidatesTest.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/GetMasterStats.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/ListTables.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/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/WrongTabletTest.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/ContinuousMoru.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/ContinuousStatsCollector.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousVerify.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/TimeBinner.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/continuous/UndefinedAnalyzer.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/BulkSplitOptimizationTest.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/functional/CacheTestClean.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/functional/FateStarvationTest.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/MaxOpenTest.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/RunTests.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/scan/CollectTabletStats.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/performance/thrift/NullTserver.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/randomwalk/Framework.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/randomwalk/concurrent/CreateUser.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/CreateUser.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/SecurityFixture.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/scalability/Run.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/trace/TraceFileSystem.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/Admin.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/util/ChangeSecret.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/CleanZookeeper.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/util/DeleteZooInstance.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/util/DumpZookeeper.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/util/EmbeddedWebServer.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/util/FindOfflineTablets.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/LocalityCheck.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/OfflineMetadataScanner.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/RemoveEntriesForMissingFiles.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/util/RestoreZookeeper.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/SystemPropUtil.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/util/TServerUtils.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/util/TableDiskUsage.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/util/TablePropUtil.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/util/VerifyTabletAssignments.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/util/ZooZap.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/zookeeper/TransactionWatcher.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/zookeeper/ZooQueueLock.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/client/BulkImporterTest.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/logger/LogFileTest.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/master/balancer/DefaultLoadBalancerTest.java
    accumulo/branches/ACCUMULO-259/server/src/test/java/org/apache/accumulo/server/master/balancer/TableLoadBalancerTest.java
    accumulo/branches/ACCUMULO-259/src/   (props changed)
    accumulo/branches/ACCUMULO-259/start/   (props changed)
    accumulo/branches/ACCUMULO-259/start/pom.xml
    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/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java
    accumulo/branches/ACCUMULO-259/test/   (props changed)
    accumulo/branches/ACCUMULO-259/test/system/auto/JavaTest.py
    accumulo/branches/ACCUMULO-259/test/system/auto/TestUtils.py
    accumulo/branches/ACCUMULO-259/test/system/auto/run.py
    accumulo/branches/ACCUMULO-259/test/system/auto/simple/binary.py
    accumulo/branches/ACCUMULO-259/test/system/auto/simple/bulk.py
    accumulo/branches/ACCUMULO-259/test/system/auto/simple/compaction.py
    accumulo/branches/ACCUMULO-259/test/system/auto/simple/delete.py
    accumulo/branches/ACCUMULO-259/test/system/auto/simple/deleterows.py
    accumulo/branches/ACCUMULO-259/test/system/auto/simple/dynamic.py
    accumulo/branches/ACCUMULO-259/test/system/auto/simple/dynamicThreadPools.py
    accumulo/branches/ACCUMULO-259/test/system/auto/simple/examples.py
    accumulo/branches/ACCUMULO-259/test/system/auto/simple/gc.py
    accumulo/branches/ACCUMULO-259/test/system/auto/simple/mapreduce.py
    accumulo/branches/ACCUMULO-259/test/system/auto/simple/merge.py
    accumulo/branches/ACCUMULO-259/test/system/auto/simple/readwrite.py
    accumulo/branches/ACCUMULO-259/test/system/auto/simple/split.py
    accumulo/branches/ACCUMULO-259/test/system/auto/simple/zoo.py
    accumulo/branches/ACCUMULO-259/test/system/auto/simple/zooCacheTest.py
    accumulo/branches/ACCUMULO-259/test/system/auto/stress/batchWrite.py
    accumulo/branches/ACCUMULO-259/test/system/auto/stress/halfDead.py
    accumulo/branches/ACCUMULO-259/test/system/auto/stress/restart.py
    accumulo/branches/ACCUMULO-259/test/system/bench/README
    accumulo/branches/ACCUMULO-259/test/system/bench/cloudstone1/cloudstone1.py
    accumulo/branches/ACCUMULO-259/test/system/bench/lib/Benchmark.py
    accumulo/branches/ACCUMULO-259/test/system/bench/lib/CreateTablesBenchmark.py
    accumulo/branches/ACCUMULO-259/test/system/bench/lib/IngestBenchmark.py
    accumulo/branches/ACCUMULO-259/test/system/bench/lib/RowHashBenchmark.py
    accumulo/branches/ACCUMULO-259/test/system/bench/lib/TableSplitsBenchmark.py
    accumulo/branches/ACCUMULO-259/test/system/bench/lib/TeraSortBenchmark.py
    accumulo/branches/ACCUMULO-259/test/system/bench/lib/cloudshell.py
    accumulo/branches/ACCUMULO-259/test/system/bench/lib/path.py
    accumulo/branches/ACCUMULO-259/test/system/bench/run.py
    accumulo/branches/ACCUMULO-259/test/system/continuous/report.pl
    accumulo/branches/ACCUMULO-259/test/system/continuous/run-moru.sh
    accumulo/branches/ACCUMULO-259/test/system/continuous/run-verify.sh
    accumulo/branches/ACCUMULO-259/test/system/continuous/start-agitator.sh
    accumulo/branches/ACCUMULO-259/test/system/continuous/start-batchwalkers.sh
    accumulo/branches/ACCUMULO-259/test/system/continuous/start-ingest.sh
    accumulo/branches/ACCUMULO-259/test/system/continuous/start-scanners.sh
    accumulo/branches/ACCUMULO-259/test/system/continuous/start-stats.sh
    accumulo/branches/ACCUMULO-259/test/system/continuous/start-walkers.sh
    accumulo/branches/ACCUMULO-259/test/system/randomwalk/bin/start-local.sh
    accumulo/branches/ACCUMULO-259/test/system/test1/ingest_test.sh
    accumulo/branches/ACCUMULO-259/test/system/test1/ingest_test_2.sh
    accumulo/branches/ACCUMULO-259/test/system/test1/verify_test.sh
    accumulo/branches/ACCUMULO-259/test/system/test1/verify_test_2.sh
    accumulo/branches/ACCUMULO-259/test/system/test2/concurrent.sh
    accumulo/branches/ACCUMULO-259/test/system/test3/bigrow.sh
    accumulo/branches/ACCUMULO-259/test/system/test4/bulk_import_test.sh
    accumulo/branches/ACCUMULO-259/test/system/upgrade_test.sh
    accumulo/branches/ACCUMULO-259/trace/   (props changed)
    accumulo/branches/ACCUMULO-259/trace/pom.xml
    accumulo/branches/ACCUMULO-259/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/impl/MilliSpan.java
    accumulo/branches/ACCUMULO-259/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/receivers/AsyncSpanReceiver.java
    accumulo/branches/ACCUMULO-259/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/thrift/TraceWrap.java
    accumulo/branches/ACCUMULO-259/trace/src/main/java/org/apache/accumulo/cloudtrace/thrift/RemoteSpan.java
    accumulo/branches/ACCUMULO-259/trace/src/main/java/org/apache/accumulo/cloudtrace/thrift/SpanReceiver.java
    accumulo/branches/ACCUMULO-259/trace/src/main/java/org/apache/accumulo/cloudtrace/thrift/TInfo.java
    accumulo/branches/ACCUMULO-259/trace/src/main/java/org/apache/accumulo/cloudtrace/thrift/TestService.java
    accumulo/branches/ACCUMULO-259/trace/src/main/thrift/cloudtrace.thrift
    accumulo/branches/ACCUMULO-259/trace/src/test/java/org/apache/accumulo/cloudtrace/instrument/CountSamplerTest.java

Propchange: accumulo/branches/ACCUMULO-259/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Jan 14 22:03:24 2013
@@ -1,6 +1,8 @@
 logs
 walogs
 target
+.idea
 .project
 .settings
 .pydevproject
+accumulo.iml

Propchange: accumulo/branches/ACCUMULO-259/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.4/src:r1407157,1423032,1423624,1427919,1428054
  Merged /accumulo/trunk:r1404663-1432174,1432271-1433134
  Merged /accumulo/branches/1.4:r1407301,1423032,1423629,1427864

Modified: accumulo/branches/ACCUMULO-259/.gitignore
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/.gitignore?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/.gitignore (original)
+++ accumulo/branches/ACCUMULO-259/.gitignore Mon Jan 14 22:03:24 2013
@@ -14,6 +14,7 @@
 # limitations under the License.
 
 # /
+*.pyc
 /logs
 /walogs
 /target
@@ -82,11 +83,19 @@
 /core/.classpath
 
 # /examples/
+/examples/lib
 /examples/target
 /examples/.settings
 /examples/.classpath
 /examples/.project
 
+# /examples/instamo/
+/examples/instamo/target
+/examples/instamo/.classpath
+/examples/instamo/.project
+/examples/instamo/.settings/
+
+
 # /examples/simple/
 /examples/simple/target
 /examples/simple/.classpath
@@ -124,6 +133,12 @@
 /trace/.project
 /trace/.settings
 
+# /test/
+/test/target
+/test/.classpath
+/test/.project
+/test/.settings
+
 # /test/system/auto/
 /test/system/auto/*.pyc
 /test/system/auto/fake_disk_failure.so
@@ -138,3 +153,7 @@
 /test/system/continuous/continuous-env.sh
 /test/system/continuous/walkers.txt
 /test/system/continuous/ingesters.txt
+
+# JetBrains IDE
+.idea
+*.iml



Mime
View raw message