Merge branch '1.6.0-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2256227b Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2256227b Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/2256227b Branch: refs/heads/master Commit: 2256227b166e5c1eafff9098d2ae8cc39cbb4f2d Parents: 5176140 fff852f Author: Christopher Tubbs <ctubb...@apache.org> Authored: Mon Mar 31 14:41:39 2014 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Mon Mar 31 14:41:39 2014 -0400 ---------------------------------------------------------------------- .../server/conf/TableConfigurationTest.java | 9 ++---- .../problems/ProblemReportingIteratorTest.java | 16 ++++++---- .../server/tablets/LogicalTimeTest.java | 14 ++++----- .../org/apache/accumulo/test/BatchWriterIT.java | 2 +- .../accumulo/test/BulkImportVolumeIT.java | 2 +- .../org/apache/accumulo/test/CleanWalIT.java | 2 +- .../accumulo/test/ConditionalWriterIT.java | 32 ++++++++++---------- .../org/apache/accumulo/test/DeleteRowsIT.java | 2 +- .../test/MasterRepairsDualAssignmentIT.java | 2 +- .../org/apache/accumulo/test/NamespacesIT.java | 2 +- .../apache/accumulo/test/SplitRecoveryIT.java | 2 +- .../java/org/apache/accumulo/test/VolumeIT.java | 12 ++++---- .../accumulo/test/functional/AbstractMacIT.java | 2 +- .../test/functional/AccumuloInputFormatIT.java | 2 +- .../accumulo/test/functional/AddSplitIT.java | 2 +- .../test/functional/BackupMasterIT.java | 2 +- .../test/functional/BadIteratorMincIT.java | 2 +- .../test/functional/BatchScanSplitIT.java | 2 +- .../test/functional/BatchWriterFlushIT.java | 2 +- .../accumulo/test/functional/BulkFileIT.java | 4 +-- .../apache/accumulo/test/functional/BulkIT.java | 2 +- .../accumulo/test/functional/ClassLoaderIT.java | 2 +- .../accumulo/test/functional/CleanTmpIT.java | 2 +- .../accumulo/test/functional/CleanUpIT.java | 2 +- .../accumulo/test/functional/CloneTestIT.java | 4 +-- .../accumulo/test/functional/CombinerIT.java | 2 +- .../functional/ConfigurableCompactionIT.java | 2 +- .../accumulo/test/functional/ConstraintIT.java | 2 +- .../test/functional/CreateAndUseIT.java | 2 +- .../test/functional/CreateManyScannersIT.java | 2 +- .../accumulo/test/functional/DeleteRowsIT.java | 2 +- .../test/functional/DeleteRowsSplitIT.java | 2 +- .../functional/DeleteTableDuringSplitIT.java | 2 +- .../test/functional/FateStarvationIT.java | 2 +- .../test/functional/GarbageCollectorIT.java | 4 +-- .../test/functional/MasterAssignmentIT.java | 2 +- .../accumulo/test/functional/MergeIT.java | 6 ++-- .../accumulo/test/functional/MetadataIT.java | 4 +-- .../accumulo/test/functional/PermissionsIT.java | 4 +-- .../accumulo/test/functional/RenameIT.java | 2 +- .../test/functional/ScanIteratorIT.java | 2 +- .../accumulo/test/functional/ScanRangeIT.java | 2 +- .../test/functional/ServerSideErrorIT.java | 2 +- .../accumulo/test/functional/SimpleMacIT.java | 19 ++++++++++++ .../test/functional/SparseColumnFamilyIT.java | 2 +- .../apache/accumulo/test/functional/SslIT.java | 2 +- .../accumulo/test/functional/TableIT.java | 2 +- .../accumulo/test/functional/TabletIT.java | 2 +- .../accumulo/test/functional/TimeoutIT.java | 2 +- .../accumulo/test/functional/VisibilityIT.java | 2 +- .../accumulo/test/functional/WriteLotsIT.java | 2 +- 51 files changed, 113 insertions(+), 93 deletions(-) ----------------------------------------------------------------------
