You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2013/12/30 20:10:05 UTC
[14/15] git commit: Merge branch '1.6.0-SNAPSHOT'
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/dcc7ed7b
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/dcc7ed7b
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/dcc7ed7b
Branch: refs/heads/master
Commit: dcc7ed7bd8c6dc598c5d0cbabe941932062c521b
Parents: 551c650 5e24798
Author: Eric Newton <er...@gmail.com>
Authored: Mon Dec 30 14:09:48 2013 -0500
Committer: Eric Newton <er...@gmail.com>
Committed: Mon Dec 30 14:09:48 2013 -0500
----------------------------------------------------------------------
.../1GB/native-standalone/accumulo-env.sh | 2 +-
conf/examples/1GB/standalone/accumulo-env.sh | 2 +-
.../2GB/native-standalone/accumulo-env.sh | 2 +-
conf/examples/2GB/standalone/accumulo-env.sh | 2 +-
.../3GB/native-standalone/accumulo-env.sh | 2 +-
conf/examples/3GB/standalone/accumulo-env.sh | 2 +-
.../512MB/native-standalone/accumulo-env.sh | 2 +-
conf/examples/512MB/standalone/accumulo-env.sh | 2 +-
.../org/apache/accumulo/core/Constants.java | 4 -
.../core/client/TableNotFoundException.java | 21 +-
.../accumulo/core/client/ZooKeeperInstance.java | 8 +-
.../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 | 39 +-
.../accumulo/core/client/impl/Tables.java | 64 +-
.../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 +-
.../core/security/AuthorizationContainer.java | 8 +-
.../accumulo/core/security/Authorizations.java | 162 +-
.../core/security/ColumnVisibility.java | 89 +-
.../accumulo/core/security/Credentials.java | 50 +-
.../core/security/NamespacePermission.java | 25 +-
.../core/security/SystemPermission.java | 25 +-
.../accumulo/core/security/TablePermission.java | 25 +-
.../core/security/VisibilityConstraint.java | 9 +
.../core/security/VisibilityEvaluator.java | 41 +-
.../core/security/VisibilityParseException.java | 12 +-
.../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 +-
pom.xml | 35 +
.../server/client/ClientServiceHandler.java | 37 +-
.../server/conf/NamespaceConfiguration.java | 5 +-
.../apache/accumulo/server/init/Initialize.java | 25 +-
.../accumulo/server/master/LiveTServerSet.java | 114 +-
.../security/AuditedSecurityOperation.java | 8 +-
.../server/security/SecurityOperation.java | 6 +-
.../server/security/handler/ZKPermHandler.java | 6 +-
.../accumulo/server/tables/TableManager.java | 95 +-
.../gc/GarbageCollectWriteAheadLogs.java | 28 +-
.../accumulo/master/FateServiceHandler.java | 412 +
.../java/org/apache/accumulo/master/Master.java | 901 +-
.../master/MasterClientServiceHandler.java | 463 +
.../accumulo/master/tableOps/CloneTable.java | 10 +-
.../master/tableOps/CreateNamespace.java | 2 +-
.../accumulo/master/tableOps/CreateTable.java | 4 +-
.../accumulo/master/tableOps/ImportTable.java | 4 +-
.../master/tableOps/RenameNamespace.java | 3 +-
.../accumulo/master/tableOps/RenameTable.java | 3 +-
.../apache/accumulo/master/tableOps/Utils.java | 4 +-
.../monitor/util/celltypes/TableLinkType.java | 14 +-
server/native/src/main/resources/Makefile | 5 +-
.../org/apache/accumulo/tserver/Tablet.java | 55 +-
.../apache/accumulo/tserver/TabletServer.java | 18 +-
.../tserver/log/TabletServerLogger.java | 6 +-
.../test/resources/ClassLoaderTestA/Test.jar | Bin 748 -> 1570 bytes
.../test/resources/ClassLoaderTestB/Test.jar | Bin 748 -> 1572 bytes
.../test/resources/ClassLoaderTestC/Test.jar | Bin 748 -> 1571 bytes
start/src/test/resources/HelloWorld2.jar | Bin 575 -> 1483 bytes
.../apache/accumulo/test/randomwalk/State.java | 64 +-
.../accumulo/test/randomwalk/bulk/Compact.java | 6 +-
.../accumulo/test/randomwalk/bulk/Split.java | 1 +
.../test/randomwalk/concurrent/Config.java | 4 +-
.../randomwalk/concurrent/DeleteNamespace.java | 3 +
.../test/randomwalk/concurrent/RenameTable.java | 23 +
.../test/randomwalk/concurrent/Setup.java | 2 +
.../test/randomwalk/image/ImageFixture.java | 15 +
.../multitable/MultiTableFixture.java | 14 +
.../test/randomwalk/security/AlterTable.java | 26 +-
.../randomwalk/security/AlterTablePerm.java | 45 +-
.../test/randomwalk/security/ChangePass.java | 2 +-
.../test/randomwalk/security/DropTable.java | 21 +-
.../test/randomwalk/security/TableOp.java | 47 +-
.../test/randomwalk/security/Validate.java | 4 +-
.../sequential/SequentialFixture.java | 14 +
.../test/randomwalk/shard/ShardFixture.java | 15 +
.../org/apache/accumulo/test/NamespacesIT.java | 1202 ++-
.../org/apache/accumulo/test/ShellServerIT.java | 6 +-
.../functional/BalanceAfterCommsFailureIT.java | 90 +
test/src/test/resources/FooConstraint.jar | Bin 1079 -> 2130 bytes
test/src/test/resources/TestCombinerX.jar | Bin 1525 -> 4335 bytes
test/src/test/resources/TestCombinerY.jar | Bin 1524 -> 4335 bytes
test/system/continuous/agitator.pl | 201 -
test/system/continuous/datanode-agitator.pl | 131 +
test/system/continuous/magitator.pl | 85 -
test/system/continuous/master-agitator.pl | 85 +
test/system/continuous/start-agitator.sh | 37 +-
test/system/continuous/stop-agitator.sh | 19 +-
test/system/continuous/tserver-agitator.pl | 129 +
102 files changed, 8931 insertions(+), 12518 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/dcc7ed7b/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/dcc7ed7b/server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java
----------------------------------------------------------------------