Merge branch '1.7'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/45e316f5 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/45e316f5 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/45e316f5 Branch: refs/heads/master Commit: 45e316f564ca01d8f7398985957cbf219bc7efb8 Parents: b87fd23 f74946d Author: Eric C. Newton <eric.new...@gmail.com> Authored: Mon Apr 27 17:02:07 2015 -0400 Committer: Eric C. Newton <eric.new...@gmail.com> Committed: Mon Apr 27 17:02:07 2015 -0400 ---------------------------------------------------------------------- .../test/java/org/apache/accumulo/proxy/ProxyDurabilityIT.java | 3 +-- test/src/test/java/org/apache/accumulo/test/CleanWalIT.java | 2 +- .../apache/accumulo/test/ConfigurableMajorCompactionIT.java | 2 +- .../apache/accumulo/test/MasterRepairsDualAssignmentIT.java | 2 +- test/src/test/java/org/apache/accumulo/test/ShellServerIT.java | 2 +- .../test/java/org/apache/accumulo/test/SplitRecoveryIT.java | 2 +- .../org/apache/accumulo/test/functional/BadIteratorMincIT.java | 2 +- .../org/apache/accumulo/test/functional/BigRootTabletIT.java | 2 +- .../java/org/apache/accumulo/test/functional/CleanTmpIT.java | 2 +- .../java/org/apache/accumulo/test/functional/CompactionIT.java | 2 +- .../org/apache/accumulo/test/functional/ConcurrencyIT.java | 2 +- .../accumulo/test/functional/ConfigurableCompactionIT.java | 2 +- .../apache/accumulo/test/functional/DeleteEverythingIT.java | 2 +- .../java/org/apache/accumulo/test/functional/DeleteRowsIT.java | 2 +- .../java/org/apache/accumulo/test/functional/DurabilityIT.java | 2 +- .../java/org/apache/accumulo/test/functional/ExamplesIT.java | 2 +- .../apache/accumulo/test/functional/FunctionalTestUtils.java | 2 +- .../apache/accumulo/test/functional/GarbageCollectorIT.java | 2 +- .../java/org/apache/accumulo/test/functional/MetadataIT.java | 2 +- .../java/org/apache/accumulo/test/functional/ReadWriteIT.java | 4 ++-- .../java/org/apache/accumulo/test/functional/RowDeleteIT.java | 6 +++--- .../apache/accumulo/test/functional/SessionDurabilityIT.java | 2 +- .../test/java/org/apache/accumulo/test/functional/TableIT.java | 4 ++-- 23 files changed, 27 insertions(+), 28 deletions(-) ----------------------------------------------------------------------
