accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vi...@apache.org
Subject [10/10] git commit: Merge remote-tracking branch 'origin/1.6.0-SNAPSHOT'
Date Thu, 30 Jan 2014 21:58:01 GMT
Merge remote-tracking branch 'origin/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/2dc88d3d
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2dc88d3d
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/2dc88d3d

Branch: refs/heads/master
Commit: 2dc88d3dcaa261aaddcf8a9947505c58027ccfc6
Parents: cac5e12 2611cba
Author: John Vines <vines@apache.org>
Authored: Thu Jan 30 16:57:40 2014 -0500
Committer: John Vines <vines@apache.org>
Committed: Thu Jan 30 16:57:40 2014 -0500

----------------------------------------------------------------------
 .../accumulo/core/client/impl/Tables.java       |  22 +-
 .../core/security/NamespacePermission.java      |  67 +++++-
 .../core/util/shell/commands/ConfigCommand.java |   2 +-
 .../server/client/ClientServiceHandler.java     |  11 +-
 .../server/conf/TableParentConfiguration.java   |   2 +-
 .../security/AuditedSecurityOperation.java      |  56 ++---
 .../server/security/SecurityOperation.java      | 228 ++++++++-----------
 .../accumulo/master/FateServiceHandler.java     |  69 ++++--
 .../java/org/apache/accumulo/master/Master.java |   2 +-
 .../master/MasterClientServiceHandler.java      |  12 +-
 .../master/tableOps/CancelCompactions.java      |   2 +-
 .../master/tableOps/ChangeTableState.java       |   2 +-
 .../accumulo/master/tableOps/CloneTable.java    |   6 +-
 .../accumulo/master/tableOps/CompactRange.java  |   4 +-
 .../accumulo/master/tableOps/CreateTable.java   |  12 +-
 .../accumulo/master/tableOps/DeleteTable.java   |   4 +-
 .../accumulo/master/tableOps/ExportTable.java   |   2 +-
 .../accumulo/master/tableOps/ImportTable.java   |  10 +-
 .../accumulo/master/tableOps/RenameTable.java   |   2 +-
 .../accumulo/master/tableOps/TableRangeOp.java  |   4 +-
 .../apache/accumulo/tserver/TabletServer.java   |  24 +-
 .../test/randomwalk/security/AlterTable.java    |  27 +--
 .../randomwalk/security/AlterTablePerm.java     |  45 ++--
 .../test/randomwalk/security/ChangePass.java    |   2 +-
 .../test/randomwalk/security/CreateTable.java   |   2 +-
 .../test/randomwalk/security/DropTable.java     |  22 +-
 .../randomwalk/security/SecurityFixture.java    |  11 +-
 .../test/randomwalk/security/TableOp.java       |  48 ++--
 .../randomwalk/security/WalkingSecurity.java    |  14 ++
 .../accumulo/test/ConditionalWriterIT.java      |   2 +-
 .../test/ConfigurableMajorCompactionIT.java     |   2 +-
 .../org/apache/accumulo/test/NamespacesIT.java  |   3 +-
 .../org/apache/accumulo/test/ShellServerIT.java |  13 +-
 .../test/functional/BatchWriterFlushIT.java     |   2 +-
 .../functional/BulkSplitOptimizationIT.java     |   2 +-
 .../accumulo/test/functional/ReadWriteIT.java   |   2 +-
 .../apache/accumulo/test/functional/SslIT.java  |   2 +-
 .../accumulo/test/functional/StartIT.java       |   2 +-
 .../accumulo/test/functional/TimeoutIT.java     |   2 +-
 .../accumulo/test/functional/WriteLotsIT.java   |   2 +-
 40 files changed, 374 insertions(+), 374 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/2dc88d3d/server/master/src/main/java/org/apache/accumulo/master/Master.java
----------------------------------------------------------------------


Mime
View raw message