Merge branch 'Merge ctubbsii changes for ACCUMULO-998 and ACCUMULO-1533'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2ad6a818 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2ad6a818 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/2ad6a818 Branch: refs/heads/master Commit: 2ad6a818857ad0f2caabb0fa086ba1666968e413 Parents: 1a48f7c a69a9d6 Author: Christopher Tubbs <ctubb...@apache.org> Authored: Mon Jul 22 14:34:29 2013 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Mon Jul 22 14:34:29 2013 -0400 ---------------------------------------------------------------------- .../apache/accumulo/core/cli/ClientOpts.java | 4 +- .../core/client/AccumuloSecurityException.java | 18 +- .../apache/accumulo/core/client/Instance.java | 15 - .../accumulo/core/client/ZooKeeperInstance.java | 61 +- .../core/client/impl/ConnectorImpl.java | 1 - .../mapreduce/AccumuloFileOutputFormat.java | 49 -- .../client/mapreduce/AccumuloOutputFormat.java | 164 ----- .../core/client/mapreduce/InputFormatBase.java | 385 ------------ .../accumulo/core/client/mock/MockInstance.java | 6 - .../core/conf/AccumuloConfiguration.java | 18 +- .../apache/accumulo/core/data/ColumnUpdate.java | 10 - .../accumulo/core/security/thrift/AuthInfo.java | 616 ------------------- .../core/security/thrift/SecurityErrorCode.java | 112 ---- .../thrift/ThriftSecurityException.java | 521 ---------------- .../apache/accumulo/core/util/shell/Shell.java | 4 +- .../core/util/shell/commands/FateCommand.java | 7 +- .../accumulo/core/zookeeper/ZooCache.java | 40 -- .../apache/accumulo/core/zookeeper/ZooUtil.java | 42 ++ core/src/main/thrift/security.thrift | 40 -- .../core/client/impl/TabletLocatorImplTest.java | 6 - .../mapreduce/AccumuloInputFormatTest.java | 40 -- .../client/security/SecurityErrorCodeTest.java | 8 +- .../accumulo/core/file/rfile/RFileTest.java | 251 ++++---- .../accumulo/server/client/HdfsZooInstance.java | 16 +- .../accumulo/server/conf/ZooConfiguration.java | 5 +- 25 files changed, 183 insertions(+), 2256 deletions(-) ----------------------------------------------------------------------
