accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [50/50] [abbrv] git commit: Merge branch '1.6.0-SNAPSHOT'
Date Wed, 04 Dec 2013 23:59:31 GMT
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/7b8922c7
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7b8922c7
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7b8922c7

Branch: refs/heads/master
Commit: 7b8922c70d0b30d0030052bcdd7db63ab57ccd02
Parents: c29df8e 859cf20
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Wed Dec 4 18:58:09 2013 -0500
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Wed Dec 4 18:58:09 2013 -0500

----------------------------------------------------------------------
 .../org/apache/accumulo/core/Constants.java     |    62 +-
 .../apache/accumulo/core/client/Connector.java  |    40 +-
 .../core/client/NamespaceExistsException.java   |    67 +
 .../core/client/NamespaceNotEmptyException.java |    74 +
 .../core/client/NamespaceNotFoundException.java |    77 +
 .../core/client/admin/NamespaceOperations.java  |   370 +
 .../client/admin/NamespaceOperationsHelper.java |   203 +
 .../client/admin/NamespaceOperationsImpl.java   |   347 +
 .../core/client/admin/SecurityOperations.java   |    88 +-
 .../client/admin/SecurityOperationsImpl.java    |    83 +-
 .../core/client/admin/TableOperations.java      |   107 +-
 .../core/client/admin/TableOperationsImpl.java  |   450 +-
 .../core/client/impl/ConnectorImpl.java         |    10 +
 .../accumulo/core/client/impl/Namespaces.java   |   107 +
 .../accumulo/core/client/impl/Tables.java       |   112 +-
 .../client/impl/TabletServerBatchWriter.java    |     2 +-
 .../core/client/impl/thrift/ClientService.java  |  9196 +++++++++++--
 .../client/impl/thrift/SecurityErrorCode.java   |     5 +-
 .../accumulo/core/client/mock/MockAccumulo.java |    53 +-
 .../core/client/mock/MockConnector.java         |     6 +
 .../core/client/mock/MockNamespace.java         |    54 +
 .../client/mock/MockNamespaceOperations.java    |   130 +
 .../client/mock/MockSecurityOperations.java     |    83 +-
 .../accumulo/core/client/mock/MockTable.java    |    36 +-
 .../core/client/mock/MockTableOperations.java   |   133 +-
 .../core/client/security/SecurityErrorCode.java |     3 +-
 .../core/master/thrift/MasterClientService.java | 11700 ++++++++++++++---
 .../accumulo/core/metadata/MetadataTable.java   |     9 +-
 .../accumulo/core/metadata/RootTable.java       |    15 +-
 .../core/security/NamespacePermission.java      |    66 +
 .../core/security/SystemPermission.java         |     5 +-
 .../org/apache/accumulo/core/util/Merge.java    |     2 +-
 .../org/apache/accumulo/core/util/Pair.java     |    57 +-
 .../apache/accumulo/core/util/shell/Shell.java  |   340 +-
 .../core/util/shell/ShellCompletor.java         |    58 +-
 .../accumulo/core/util/shell/ShellOptions.java  |     3 +-
 .../core/util/shell/commands/ConfigCommand.java |   113 +-
 .../util/shell/commands/ConstraintCommand.java  |    84 +-
 .../shell/commands/CreateNamespaceCommand.java  |   108 +
 .../util/shell/commands/CreateTableCommand.java |    69 +-
 .../core/util/shell/commands/DUCommand.java     |    37 +-
 .../util/shell/commands/DeleteIterCommand.java  |    61 +-
 .../shell/commands/DeleteNamespaceCommand.java  |   100 +
 .../util/shell/commands/DeleteTableCommand.java |    12 +-
 .../core/util/shell/commands/GrantCommand.java  |    47 +-
 .../util/shell/commands/ListIterCommand.java    |    59 +-
 .../commands/NamespacePermissionsCommand.java   |    44 +
 .../util/shell/commands/NamespacesCommand.java  |    83 +
 .../core/util/shell/commands/OptUtil.java       |    56 +-
 .../shell/commands/RenameNamespaceCommand.java  |    79 +
 .../util/shell/commands/RenameTableCommand.java |    17 +-
 .../core/util/shell/commands/RevokeCommand.java |    45 +-
 .../util/shell/commands/SetIterCommand.java     |   149 +-
 .../util/shell/commands/TableOperation.java     |    56 +-
 .../core/util/shell/commands/TablesCommand.java |    88 +-
 .../shell/commands/UserPermissionsCommand.java  |    34 +-
 core/src/main/thrift/client.thrift              |    12 +-
 core/src/main/thrift/master.thrift              |    12 +-
 .../core/client/impl/TabletLocatorImplTest.java |    10 +-
 .../core/client/mock/MockNamespacesTest.java    |   315 +
 .../accumulo/core/util/shell/ShellTest.java     |    54 +-
 .../chapters/administration.tex                 |     2 +-
 .../accumulo_user_manual/chapters/shell.tex     |     8 +-
 .../chapters/table_configuration.tex            |     2 +-
 .../chapters/troubleshooting.tex                |    30 +-
 .../apache/accumulo/proxy/SimpleProxyIT.java    |     2 +-
 .../apache/accumulo/server/ServerConstants.java |     9 +-
 .../server/client/ClientServiceHandler.java     |   170 +-
 .../server/conf/NamespaceConfWatcher.java       |   107 +
 .../server/conf/NamespaceConfiguration.java     |   174 +
 .../server/conf/ServerConfiguration.java        |    75 +-
 .../server/conf/TableConfiguration.java         |    46 +-
 .../server/conf/TableParentConfiguration.java   |    39 +
 .../org/apache/accumulo/server/fs/FileRef.java  |     5 +-
 .../accumulo/server/fs/VolumeManager.java       |     2 +-
 .../apache/accumulo/server/init/Initialize.java |    26 +
 .../master/balancer/TableLoadBalancer.java      |    30 +-
 .../master/state/MetaDataTableScanner.java      |     2 +-
 .../security/AuditedSecurityOperation.java      |     2 +-
 .../server/security/SecurityOperation.java      |   411 +-
 .../security/handler/InsecurePermHandler.java   |    31 +
 .../security/handler/PermissionHandler.java     |    61 +-
 .../server/security/handler/ZKAuthorizor.java   |    41 +-
 .../server/security/handler/ZKPermHandler.java  |   209 +-
 .../server/security/handler/ZKSecurityTool.java |    21 +
 .../accumulo/server/tables/TableManager.java    |   121 +-
 .../accumulo/server/util/MetadataTableUtil.java |     4 +-
 .../accumulo/server/util/NamespacePropUtil.java |    60 +
 .../accumulo/server/util/TablePropUtil.java     |     2 +-
 .../accumulo/gc/SimpleGarbageCollector.java     |     8 +-
 .../java/org/apache/accumulo/master/Master.java |   307 +-
 .../accumulo/master/tableOps/BulkImport.java    |     2 +-
 .../master/tableOps/CancelCompactions.java      |    17 +-
 .../master/tableOps/ChangeTableState.java       |    26 +-
 .../accumulo/master/tableOps/CloneTable.java    |   116 +-
 .../accumulo/master/tableOps/CompactRange.java  |    95 +-
 .../master/tableOps/CreateNamespace.java        |   196 +
 .../accumulo/master/tableOps/CreateTable.java   |   134 +-
 .../master/tableOps/DeleteNamespace.java        |   104 +
 .../accumulo/master/tableOps/DeleteTable.java   |    19 +-
 .../accumulo/master/tableOps/ExportTable.java   |    10 +-
 .../accumulo/master/tableOps/ImportTable.java   |   268 +-
 .../master/tableOps/RenameNamespace.java        |    92 +
 .../accumulo/master/tableOps/RenameTable.java   |    54 +-
 .../accumulo/master/tableOps/TableRangeOp.java  |    56 +-
 .../apache/accumulo/master/tableOps/Utils.java  |    62 +-
 .../apache/accumulo/master/TestMergeState.java  |    52 +-
 .../src/main/resources/docs/bulkIngest.html     |     2 +-
 .../main/resources/docs/examples/README.bloom   |     9 +-
 .../main/resources/docs/examples/README.export  |     9 +-
 .../resources/docs/examples/README.visibility   |     4 +-
 .../org/apache/accumulo/tserver/Tablet.java     |    24 +-
 .../apache/accumulo/tserver/TabletServer.java   |     4 +-
 test/scale/deleteLargeTable.txt                 |     2 +-
 .../accumulo/test/functional/ZombieTServer.java |     2 +-
 .../metadata/MetadataBatchScanTest.java         |     2 +-
 .../test/performance/thrift/NullTserver.java    |     4 +-
 .../concurrent/ChangePermissions.java           |    37 +-
 .../randomwalk/concurrent/CheckPermission.java  |    27 +-
 .../test/randomwalk/concurrent/CloneTable.java  |     4 +-
 .../test/randomwalk/concurrent/Config.java      |   111 +-
 .../randomwalk/concurrent/CreateNamespace.java  |    48 +
 .../test/randomwalk/concurrent/CreateTable.java |     4 +-
 .../randomwalk/concurrent/DeleteNamespace.java  |    48 +
 .../test/randomwalk/concurrent/Merge.java       |     2 +-
 .../randomwalk/concurrent/RenameNamespace.java  |    52 +
 .../test/randomwalk/concurrent/RenameTable.java |     4 +-
 .../test/randomwalk/concurrent/Setup.java       |    23 +-
 .../randomwalk/security/WalkingSecurity.java    |   183 +-
 .../org/apache/accumulo/test/DumpConfigIT.java  |     6 +-
 .../org/apache/accumulo/test/NamespacesIT.java  |   555 +
 .../org/apache/accumulo/test/ShellServerIT.java |   111 +-
 .../apache/accumulo/test/SplitRecoveryIT.java   |     2 +-
 .../test/functional/GarbageCollectorIT.java     |     4 +-
 .../accumulo/test/functional/PermissionsIT.java |    93 +-
 .../accumulo/test/functional/RestartIT.java     |    18 +-
 test/system/bench/cloudstone1/cloudstone1.py    |     4 +-
 .../randomwalk/conf/modules/Concurrent.xml      |    23 +-
 138 files changed, 25343 insertions(+), 5285 deletions(-)
----------------------------------------------------------------------



Mime
View raw message