accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject [2/2] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo
Date Mon, 29 Jul 2013 14:26:03 GMT
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f479cad5
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f479cad5
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f479cad5

Branch: refs/heads/master
Commit: f479cad585c0f1f7407656fd10c89d3304231da1
Parents: 3d06f47 5e0d7e7
Author: Eric Newton <ecn@apache.org>
Authored: Mon Jul 29 10:23:36 2013 -0400
Committer: Eric Newton <ecn@apache.org>
Committed: Mon Jul 29 10:23:36 2013 -0400

----------------------------------------------------------------------
 .../accumulo/core/client/IteratorSetting.java   |   7 +-
 .../core/client/MutationsRejectedException.java |  11 +-
 .../accumulo/core/client/ZooKeeperInstance.java |   4 +-
 .../client/admin/InstanceOperationsImpl.java    |  23 +--
 .../client/admin/SecurityOperationsImpl.java    |  38 ++--
 .../core/client/admin/TableOperationsImpl.java  |  39 ++--
 .../core/client/impl/BatchWriterImpl.java       |   6 +-
 .../core/client/impl/ConditionalWriterImpl.java | 178 +++++++++----------
 .../core/client/impl/ConnectorImpl.java         |  10 +-
 .../client/impl/MultiTableBatchWriterImpl.java  |   6 +-
 .../core/client/impl/OfflineScanner.java        |  17 +-
 .../core/client/impl/RootTabletLocator.java     |  10 +-
 .../accumulo/core/client/impl/ScannerImpl.java  |  14 +-
 .../core/client/impl/ScannerIterator.java       |  13 +-
 .../core/client/impl/TabletLocator.java         |  10 +-
 .../core/client/impl/TabletLocatorImpl.java     |  48 ++---
 .../client/impl/TabletServerBatchDeleter.java   |   6 +-
 .../client/impl/TabletServerBatchReader.java    |   6 +-
 .../impl/TabletServerBatchReaderIterator.java   |  30 ++--
 .../client/impl/TabletServerBatchWriter.java    |  12 +-
 .../core/client/impl/ThriftScanner.java         |  27 +--
 .../core/client/impl/TimeoutTabletLocator.java  |  16 +-
 .../accumulo/core/client/impl/Writer.java       |  22 +--
 .../client/mapred/AccumuloOutputFormat.java     |  10 +-
 .../core/client/mapred/InputFormatBase.java     |  15 +-
 .../client/mapreduce/AccumuloOutputFormat.java  |   9 +-
 .../core/client/mapreduce/InputFormatBase.java  |  21 +--
 .../mapreduce/lib/util/ConfiguratorBase.java    |  44 ++---
 .../mapreduce/lib/util/InputConfigurator.java   |   6 +-
 .../core/client/mock/MockTableOperations.java   |   2 +
 .../core/client/mock/MockTabletLocator.java     |  13 +-
 .../security/tokens/AuthenticationToken.java    | 105 ++++++++++-
 .../core/client/security/tokens/NullToken.java  |   7 +
 .../accumulo/core/file/BloomFilterLayer.java    |   8 +-
 .../core/metadata/MetadataLocationObtainer.java |  14 +-
 .../core/metadata/MetadataServicer.java         |  10 +-
 .../core/metadata/ServicerForMetadataTable.java |   4 +-
 .../core/metadata/ServicerForRootTable.java     |   4 +-
 .../core/metadata/ServicerForUserTables.java    |   4 +-
 .../core/metadata/TableMetadataServicer.java    |  10 +-
 .../core/metadata/schema/MetadataSchema.java    |   4 +-
 .../accumulo/core/security/Authorizations.java  |   2 -
 .../core/security/CredentialHelper.java         | 131 --------------
 .../accumulo/core/security/Credentials.java     |  58 +++++-
 .../security/crypto/CryptoModuleFactory.java    |  29 ++-
 .../apache/accumulo/core/util/CreateToken.java  |   5 +-
 .../org/apache/accumulo/core/util/Merge.java    |   2 +-
 .../client/admin/TableOperationsHelperTest.java |   6 +-
 .../core/client/impl/TabletLocatorImplTest.java | 126 ++++++-------
 .../core/client/mapred/TokenFileTest.java       |   4 +-
 .../core/client/mapreduce/TokenFileTest.java    |   4 +-
 .../core/metadata/MetadataServicerTest.java     |   5 +-
 .../core/security/AuthenticationTokenTest.java  |  56 ++++++
 .../accumulo/core/security/CredentialsTest.java |  84 +++++++++
 .../minicluster/MiniAccumuloCluster.java        |   2 +-
 .../minicluster/MiniAccumuloConfig.java         |  20 +--
 .../org/apache/accumulo/proxy/ProxyServer.java  |  41 ++---
 .../apache/accumulo/proxy/TestProxyClient.java  |   2 +-
 .../proxy/TestProxySecurityOperations.java      |  15 +-
 .../server/cli/ClientOnRequiredTable.java       |   2 +-
 .../accumulo/server/client/BulkImporter.java    |  50 +++---
 .../server/client/ClientServiceHandler.java     |  14 +-
 .../accumulo/server/client/HdfsZooInstance.java |   7 +-
 .../server/gc/GarbageCollectWriteAheadLogs.java |   4 +-
 .../server/gc/SimpleGarbageCollector.java       |  18 +-
 .../accumulo/server/master/LiveTServerSet.java  |  26 +--
 .../apache/accumulo/server/master/Master.java   |  13 +-
 .../server/master/TabletGroupWatcher.java       |  10 +-
 .../master/balancer/ChaoticLoadBalancer.java    |   4 +-
 .../server/master/balancer/TabletBalancer.java  |   3 +-
 .../server/master/state/MetaDataStateStore.java |  19 +-
 .../master/state/MetaDataTableScanner.java      |  19 +-
 .../master/state/RootTabletStateStore.java      |   8 +-
 .../server/master/tableOps/BulkImport.java      |   3 +-
 .../server/master/tableOps/CloneTable.java      |   9 +-
 .../server/master/tableOps/CreateTable.java     |   9 +-
 .../server/master/tableOps/DeleteTable.java     |   4 +-
 .../server/master/tableOps/ImportTable.java     |   6 +-
 .../apache/accumulo/server/monitor/Monitor.java |   4 +-
 .../monitor/servlets/TServersServlet.java       |   4 +-
 .../server/monitor/servlets/TablesServlet.java  |   4 +-
 .../accumulo/server/problems/ProblemReport.java |   4 +-
 .../server/problems/ProblemReports.java         |   2 +-
 .../security/AuditedSecurityOperation.java      |   5 +-
 .../server/security/SecurityOperation.java      |  17 +-
 .../server/security/SystemCredentials.java      |   9 +-
 .../security/handler/ZKAuthenticator.java       |   5 +-
 .../accumulo/server/tabletserver/Tablet.java    |  42 +++--
 .../server/tabletserver/TabletServer.java       |  10 +-
 .../accumulo/server/trace/TraceFileSystem.java  |   1 +
 .../org/apache/accumulo/server/util/Admin.java  |  20 +--
 .../server/util/CheckForMetadataProblems.java   |   6 +-
 .../server/util/FindOfflineTablets.java         |   4 +-
 .../apache/accumulo/server/util/Initialize.java |   3 +-
 .../accumulo/server/util/MetadataTableUtil.java |  85 +++++----
 .../server/util/VerifyTabletAssignments.java    |  17 +-
 .../server/client/BulkImporterTest.java         |  15 +-
 .../accumulo/server/gc/TestConfirmDeletes.java  |  14 +-
 .../accumulo/server/master/TestMergeState.java  |   7 +-
 .../balancer/ChaoticLoadBalancerTest.java       |   4 +-
 .../server/security/SystemCredentialsTest.java  |   4 +-
 .../apache/accumulo/test/GetMasterStats.java    |  15 +-
 .../apache/accumulo/test/WrongTabletTest.java   |  11 +-
 .../continuous/ContinuousStatsCollector.java    |   2 +-
 .../test/functional/FunctionalTest.java         |   3 -
 .../test/functional/SplitRecoveryTest.java      |  24 +--
 .../performance/scan/CollectTabletStats.java    |  15 +-
 .../test/performance/thrift/NullTserver.java    |  11 +-
 .../apache/accumulo/test/randomwalk/State.java  |  11 +-
 .../test/randomwalk/concurrent/Shutdown.java    |   6 +-
 .../test/randomwalk/concurrent/StartAll.java    |   6 +-
 .../randomwalk/security/AlterTablePerm.java     |   9 +-
 .../test/randomwalk/security/Authenticate.java  |   4 +-
 .../test/randomwalk/security/ChangePass.java    |   4 +-
 .../test/randomwalk/security/DropTable.java     |   4 +-
 .../randomwalk/security/SecurityFixture.java    |   3 +-
 .../test/randomwalk/security/SetAuths.java      |   6 +-
 .../randomwalk/security/WalkingSecurity.java    |   8 +-
 .../accumulo/test/ConditionalWriterTest.java    | 169 +++++++++---------
 .../test/functional/DynamicThreadPoolsIT.java   |  13 +-
 .../test/functional/HalfDeadTServerIT.java      |  27 +--
 .../test/functional/MetadataMaxFiles.java       |   8 +-
 .../functional/SimpleBalancerFairnessIT.java    |  17 +-
 123 files changed, 1239 insertions(+), 1086 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/f479cad5/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java
----------------------------------------------------------------------

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


Mime
View raw message