Merge branch '1.6.0-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a267d349 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a267d349 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a267d349 Branch: refs/heads/master Commit: a267d349dc6ad46b9da4ae4cfa010d5a279166c9 Parents: 2c37c45 f35e3f4 Author: Christopher Tubbs <ctubb...@apache.org> Authored: Fri Dec 27 20:07:06 2013 -0500 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Fri Dec 27 20:07:06 2013 -0500 ---------------------------------------------------------------------- .../org/apache/accumulo/core/Constants.java | 4 - .../core/client/TableNotFoundException.java | 21 +- .../core/client/admin/NamespaceOperations.java | 2 +- .../client/admin/NamespaceOperationsImpl.java | 193 +- .../client/admin/TableOperationsHelper.java | 35 +- .../core/client/admin/TableOperationsImpl.java | 256 +- .../core/client/impl/ConnectorImpl.java | 55 +- .../accumulo/core/client/impl/MasterClient.java | 76 +- .../accumulo/core/client/impl/Namespaces.java | 33 +- .../accumulo/core/client/impl/Tables.java | 32 +- .../thrift/TableOperationExceptionType.java | 11 +- .../accumulo/core/client/mock/MockAccumulo.java | 6 +- .../core/client/mock/MockTableOperations.java | 12 +- .../core/master/thrift/FateOperation.java | 103 + .../core/master/thrift/FateService.java | 5017 +++++++++ .../core/master/thrift/MasterClientService.java | 9946 +----------------- .../core/master/thrift/TableOperation.java | 94 - .../accumulo/core/metadata/MetadataTable.java | 4 +- .../accumulo/core/metadata/RootTable.java | 4 +- .../util/shell/commands/NamespacesCommand.java | 4 +- core/src/main/thrift/client.thrift | 203 +- core/src/main/thrift/master.thrift | 222 +- .../core/client/mock/MockNamespacesTest.java | 5 +- .../client/mock/MockTableOperationsTest.java | 49 +- .../server/client/ClientServiceHandler.java | 37 +- .../server/conf/NamespaceConfiguration.java | 5 +- .../apache/accumulo/server/init/Initialize.java | 9 +- .../accumulo/server/master/LiveTServerSet.java | 114 +- .../security/AuditedSecurityOperation.java | 8 +- .../server/security/SecurityOperation.java | 6 +- .../server/security/handler/ZKPermHandler.java | 6 +- .../accumulo/master/FateServiceHandler.java | 412 + .../java/org/apache/accumulo/master/Master.java | 852 +- .../master/MasterClientServiceHandler.java | 463 + .../accumulo/master/tableOps/CloneTable.java | 10 +- .../master/tableOps/RenameNamespace.java | 3 +- .../accumulo/master/tableOps/RenameTable.java | 3 +- .../apache/accumulo/master/tableOps/Utils.java | 4 +- .../test/randomwalk/concurrent/Config.java | 4 +- .../org/apache/accumulo/test/NamespacesIT.java | 1202 ++- .../org/apache/accumulo/test/ShellServerIT.java | 6 +- 41 files changed, 7683 insertions(+), 11848 deletions(-) ----------------------------------------------------------------------
