Merge branch '1.8'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c7764837 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c7764837 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c7764837 Branch: refs/heads/master Commit: c77648377daa8054321219b5fba2412cdd9d3fa7 Parents: 4af2349 e67317c Author: Keith Turner <ke...@deenlo.com> Authored: Thu Jun 2 12:28:03 2016 -0400 Committer: Keith Turner <ke...@deenlo.com> Committed: Thu Jun 2 12:28:03 2016 -0400 ---------------------------------------------------------------------- .../accumulo/core/client/BatchWriter.java | 3 +- .../accumulo/core/client/ConditionalWriter.java | 3 +- .../accumulo/core/client/ScannerBase.java | 5 +- .../core/client/impl/ScannerImplTest.java | 4 + .../impl/TabletServerBatchReaderTest.java | 6 +- .../examples/simple/reservations/ARS.java | 45 +- .../server/util/MasterMetadataUtil.java | 57 +- .../accumulo/server/util/MetadataTableUtil.java | 288 ++--- .../accumulo/gc/SimpleGarbageCollector.java | 1 + .../accumulo/master/tableOps/CopyFailed.java | 21 +- .../apache/accumulo/tserver/TabletServer.java | 14 +- .../accumulo/test/ConditionalWriterIT.java | 1144 +++++++++--------- .../test/functional/BatchWriterFlushIT.java | 33 +- .../accumulo/test/functional/ReadWriteIT.java | 62 +- .../test/functional/SplitRecoveryIT.java | 72 +- .../test/randomwalk/bulk/ConsistencyCheck.java | 24 +- .../test/randomwalk/conditional/Transfer.java | 94 +- .../test/randomwalk/conditional/Verify.java | 37 +- 18 files changed, 957 insertions(+), 956 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/c7764837/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/c7764837/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java ----------------------------------------------------------------------
