accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [10/10] accumulo git commit: Merge branch 'ACCUMULO-3147'
Date Fri, 07 Nov 2014 22:31:25 GMT
Merge branch 'ACCUMULO-3147'


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

Branch: refs/heads/master
Commit: 34ca056b35fdfe60d782241ef72a44d04986080c
Parents: 5aff1fb bc62474
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Fri Nov 7 17:29:26 2014 -0500
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Fri Nov 7 17:29:26 2014 -0500

----------------------------------------------------------------------
 .../client/impl/ReplicationOperationsImpl.java  |  11 +-
 .../accumulo/core/client/mock/MockAccumulo.java |   2 +
 .../core/client/mock/MockTableOperations.java   |   8 +-
 .../replication/PrintReplicationRecords.java    |   4 +-
 .../core/replication/ReplicaSystemHelper.java   |  11 +-
 .../core/replication/ReplicationConstants.java  |   1 -
 .../core/replication/ReplicationTable.java      |  99 ++++++++
 .../ReplicationTableOfflineException.java       |  32 +++
 .../ReplicationOperationsImplTest.java          |  22 +-
 .../apache/accumulo/server/ServerConstants.java |   8 +-
 .../server/constraints/MetadataConstraints.java | 119 +++++-----
 .../apache/accumulo/server/init/Initialize.java | 174 +++++++++-----
 .../server/replication/ReplicationTable.java    | 227 -------------------
 .../server/replication/ReplicationUtil.java     |  47 ++--
 .../server/security/SecurityOperation.java      |   3 +-
 .../accumulo/server/util/MetadataTableUtil.java |  24 +-
 .../replication/ReplicationTableTest.java       | 132 -----------
 .../gc/GarbageCollectWriteAheadLogs.java        |  42 ++--
 .../accumulo/gc/SimpleGarbageCollector.java     |   7 +-
 .../CloseWriteAheadLogReferences.java           |  16 +-
 .../gc/GarbageCollectWriteAheadLogsTest.java    |  37 ++-
 .../CloseWriteAheadLogReferencesTest.java       |  15 +-
 .../accumulo/master/FateServiceHandler.java     |   3 +-
 .../java/org/apache/accumulo/master/Master.java |  21 +-
 .../master/metrics/ReplicationMetrics.java      |   7 +-
 .../DistributedWorkQueueWorkAssigner.java       |  20 +-
 .../master/replication/FinishedWorkUpdater.java |  15 +-
 .../RemoveCompleteReplicationRecords.java       |  12 +-
 .../master/replication/StatusMaker.java         |  57 ++---
 .../accumulo/master/replication/WorkMaker.java  |  12 +-
 .../accumulo/master/util/TableValidators.java   |  26 ++-
 .../replication/FinishedWorkUpdaterTest.java    |  16 +-
 .../RemoveCompleteReplicationRecordsTest.java   |   9 +-
 .../replication/SequentialWorkAssignerTest.java |  16 +-
 .../master/replication/StatusMakerTest.java     |   2 +-
 .../replication/UnorderedWorkAssignerTest.java  |  18 +-
 .../master/replication/WorkMakerTest.java       |  17 +-
 .../monitor/servlets/ReplicationServlet.java    |   5 +-
 .../replication/ReplicationProcessor.java       |   8 +-
 .../apache/accumulo/test/LargeSplitRowIT.java   |   5 +-
 .../test/MasterRepairsDualAssignmentIT.java     |   8 +-
 .../accumulo/test/MetaConstraintRetryIT.java    |   7 +-
 .../org/apache/accumulo/test/NamespacesIT.java  |   6 +-
 .../org/apache/accumulo/test/ShellServerIT.java |  17 +-
 .../apache/accumulo/test/WaitForBalanceIT.java  |  14 +-
 .../replication/MultiInstanceReplicationIT.java |  21 +-
 .../test/replication/ReplicationIT.java         | 210 +++++++++++------
 .../test/replication/StatusCombinerMacTest.java |  20 +-
 .../UnorderedWorkAssignerReplicationIT.java     |  14 +-
 49 files changed, 800 insertions(+), 827 deletions(-)
----------------------------------------------------------------------



Mime
View raw message