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/16dff26b Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/16dff26b Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/16dff26b Branch: refs/heads/master Commit: 16dff26b81c9c01f3064584e3fa953c4b72daa2c Parents: f83f526 eab028a Author: Eric Newton <eric.new...@gmail.com> Authored: Thu Feb 27 12:14:54 2014 -0500 Committer: Eric Newton <eric.new...@gmail.com> Committed: Thu Feb 27 12:14:54 2014 -0500 ---------------------------------------------------------------------- .../org/apache/accumulo/test/CleanWalIT.java | 18 ++--------- .../test/ConfigurableMajorCompactionIT.java | 10 ++---- .../test/MasterRepairsDualAssignmentIT.java | 4 +-- .../accumulo/test/NoMutationRecoveryIT.java | 6 ++-- .../org/apache/accumulo/test/ShellServerIT.java | 5 ++- .../apache/accumulo/test/SplitRecoveryIT.java | 7 ++--- .../test/functional/BadIteratorMincIT.java | 13 +++----- .../test/functional/BigRootTabletIT.java | 9 +----- .../accumulo/test/functional/CleanTmpIT.java | 7 +---- .../accumulo/test/functional/CompactionIT.java | 9 +----- .../accumulo/test/functional/ConcurrencyIT.java | 8 +---- .../functional/ConfigurableCompactionIT.java | 10 +----- .../test/functional/DeleteEverythingIT.java | 14 +++------ .../accumulo/test/functional/ExamplesIT.java | 6 +--- .../test/functional/FunctionalTestUtils.java | 4 +-- .../test/functional/GarbageCollectorIT.java | 7 +---- .../accumulo/test/functional/MetadataIT.java | 8 ++--- .../accumulo/test/functional/ReadWriteIT.java | 8 ++--- .../accumulo/test/functional/RowDeleteIT.java | 32 +++++--------------- .../accumulo/test/functional/TableIT.java | 17 ++--------- 20 files changed, 44 insertions(+), 158 deletions(-) ----------------------------------------------------------------------
