Merge branch '1.6.0-SNAPSHOT'
Conflicts:
server/base/src/main/java/org/apache/accumulo/server/Accumulo.java
server/master/src/main/java/org/apache/accumulo/master/FateServiceHandler.java
server/master/src/main/java/org/apache/accumulo/master/Master.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ebbd5e62
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ebbd5e62
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ebbd5e62
Branch: refs/heads/master
Commit: ebbd5e62b884a2c1d64dfdf1e32a4d097d4ac662
Parents: bdc2a99 f5a94f0
Author: Sean Busbey <bus...@cloudera.com>
Authored: Fri Apr 4 17:35:16 2014 -0700
Committer: Sean Busbey <bus...@cloudera.com>
Committed: Fri Apr 4 17:35:16 2014 -0700
----------------------------------------------------------------------
README | 40 ++++--
.../core/util/shell/commands/FateCommand.java | 2 +-
fate/pom.xml | 9 ++
.../org/apache/accumulo/fate/AdminUtil.java | 14 +--
.../java/org/apache/accumulo/fate/Fate.java | 2 +-
.../org/apache/accumulo/fate/ReadOnlyRepo.java | 32 +++++
.../org/apache/accumulo/fate/ReadOnlyStore.java | 111 ++++++++++++++++
.../apache/accumulo/fate/ReadOnlyTStore.java | 125 +++++++++++++++++++
.../java/org/apache/accumulo/fate/Repo.java | 5 +-
.../java/org/apache/accumulo/fate/TStore.java | 62 +--------
.../apache/accumulo/fate/AgeOffStoreTest.java | 2 +-
.../apache/accumulo/fate/ReadOnlyStoreTest.java | 72 +++++++++++
.../org/apache/accumulo/fate/SimpleStore.java | 2 +-
.../org/apache/accumulo/server/Accumulo.java | 33 ++++-
.../accumulo/server/util/MetadataTableUtil.java | 3 +
.../accumulo/master/FateServiceHandler.java | 2 +-
.../java/org/apache/accumulo/master/Master.java | 77 ++++++++----
.../apache/accumulo/master/util/FateAdmin.java | 3 +-
18 files changed, 483 insertions(+), 113 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/ebbd5e62/fate/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/ebbd5e62/fate/src/main/java/org/apache/accumulo/fate/Fate.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/ebbd5e62/server/base/src/main/java/org/apache/accumulo/server/Accumulo.java
----------------------------------------------------------------------
diff --cc server/base/src/main/java/org/apache/accumulo/server/Accumulo.java
index 29ed2b7,4e1eb35..c29f3c6
--- a/server/base/src/main/java/org/apache/accumulo/server/Accumulo.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/Accumulo.java
@@@ -27,7 -26,7 +27,8 @@@ import java.util.Map.Entry
import java.util.TreeMap;
import org.apache.accumulo.core.Constants;
+import org.apache.accumulo.core.conf.AccumuloConfiguration;
+ import org.apache.accumulo.core.client.AccumuloException;
import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.core.trace.DistributedTrace;
import org.apache.accumulo.core.util.AddressUtil;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/ebbd5e62/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/ebbd5e62/server/master/src/main/java/org/apache/accumulo/master/FateServiceHandler.java
----------------------------------------------------------------------
diff --cc
server/master/src/main/java/org/apache/accumulo/master/FateServiceHandler.java
index ae60da0,d63a63e..ff488b9
---
a/server/master/src/main/java/org/apache/accumulo/master/FateServiceHandler.java
+++
b/server/master/src/main/java/org/apache/accumulo/master/FateServiceHandler.java
@@@ -39,9 -39,9 +39,9 @@@ import org.apache.accumulo.core.iterato
import org.apache.accumulo.core.master.thrift.FateOperation;
import org.apache.accumulo.core.master.thrift.FateService;
import org.apache.accumulo.core.security.thrift.TCredentials;
-import org.apache.accumulo.core.util.ArgumentChecker.Validator;
import org.apache.accumulo.core.util.ByteBufferUtil;
+import org.apache.accumulo.core.util.Validator;
- import org.apache.accumulo.fate.TStore.TStatus;
+ import org.apache.accumulo.fate.ReadOnlyTStore.TStatus;
import org.apache.accumulo.master.tableOps.BulkImport;
import org.apache.accumulo.master.tableOps.CancelCompactions;
import org.apache.accumulo.master.tableOps.ChangeTableState;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/ebbd5e62/server/master/src/main/java/org/apache/accumulo/master/Master.java
----------------------------------------------------------------------
