Merge remote-tracking branch 'origin' into ACCUMULO-1000
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d0e8b37d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d0e8b37d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d0e8b37d Branch: refs/heads/ACCUMULO-1000 Commit: d0e8b37d157aa7032793cc465a063c1c6d2d6cf2 Parents: 96a4815 2ad6a81 Author: Keith Turner <ktur...@apache.org> Authored: Mon Jul 22 17:09:40 2013 -0400 Committer: Keith Turner <ktur...@apache.org> Committed: Mon Jul 22 17:09:40 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 +- .../org/apache/accumulo/core/conf/Property.java | 6 - .../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 ++++---- .../fate/zookeeper/IZooReaderWriter.java | 5 +- .../fate/zookeeper/ZooReaderWriter.java | 4 - .../accumulo/server/client/HdfsZooInstance.java | 16 +- .../accumulo/server/conf/ZooConfiguration.java | 5 +- .../apache/accumulo/server/master/Master.java | 2 +- .../master/state/tables/TableManager.java | 2 +- .../master/tableOps/CancelCompactions.java | 2 +- .../server/master/tableOps/CompactRange.java | 2 +- .../server/master/tableOps/RenameTable.java | 2 +- .../accumulo/server/master/tableOps/Utils.java | 2 +- .../server/metrics/AbstractMetricsImpl.java | 1 - .../server/tabletserver/TabletServer.java | 17 - .../accumulo/server/util/TServerUtils.java | 11 +- 37 files changed, 201 insertions(+), 2294 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/d0e8b37d/core/src/main/java/org/apache/accumulo/core/client/impl/ConnectorImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/d0e8b37d/core/src/test/java/org/apache/accumulo/core/client/impl/TabletLocatorImplTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/d0e8b37d/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java ----------------------------------------------------------------------