accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [13/13] accumulo git commit: Merge remote-tracking branch 'origin/master'
Date Sat, 20 Feb 2016 03:01:39 GMT
Merge remote-tracking branch 'origin/master'


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

Branch: refs/heads/master
Commit: 82e25e894ce87a5f2824feeeceeace62cfd20d08
Parents: 869e73b a14bc29
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Fri Feb 19 21:59:07 2016 -0500
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Fri Feb 19 21:59:07 2016 -0500

----------------------------------------------------------------------
 .../core/client/impl/ActiveCompactionImpl.java  |   5 +-
 .../core/client/impl/ActiveScanImpl.java        |   9 +-
 .../core/client/impl/BatchWriterImpl.java       |  12 +-
 .../core/client/impl/ConditionalWriterImpl.java |   2 +-
 .../client/impl/MultiTableBatchWriterImpl.java  |  10 +-
 .../core/client/impl/OfflineIterator.java       |   4 +-
 .../client/impl/ReplicationOperationsImpl.java  |  22 +-
 .../accumulo/core/client/impl/ScannerImpl.java  |  11 +-
 .../core/client/impl/ScannerIterator.java       |   5 +-
 .../core/client/impl/TableOperationsImpl.java   |  14 +-
 .../core/client/impl/TabletLocator.java         |  14 +-
 .../core/client/impl/TabletLocatorImpl.java     |   6 +-
 .../client/impl/TabletServerBatchReader.java    |  10 +-
 .../impl/TabletServerBatchReaderIterator.java   |  25 +-
 .../client/impl/TabletServerBatchWriter.java    |  24 +-
 .../core/client/impl/ThriftScanner.java         |  23 +-
 .../accumulo/core/client/impl/Writer.java       |  22 +-
 .../client/mapred/AccumuloOutputFormat.java     |   5 +-
 .../client/mapreduce/AccumuloOutputFormat.java  |   5 +-
 .../mapreduce/lib/impl/InputConfigurator.java   |   6 +-
 .../client/mock/impl/MockTabletLocator.java     |   2 +-
 .../apache/accumulo/core/data/KeyExtent.java    |  12 +-
 .../accumulo/core/data/impl/KeyExtent.java      |  58 +--
 .../accumulo/core/data/impl/TabletIdImpl.java   |   4 +-
 .../accumulo/core/metadata/RootTable.java       |   5 +-
 .../core/metadata/schema/MetadataSchema.java    |  12 +-
 .../core/replication/ReplicationSchema.java     |  27 +-
 .../org/apache/accumulo/core/util/Merge.java    |   2 +-
 .../client/impl/TableOperationsImplTest.java    |   3 +-
 .../core/client/impl/TabletLocatorImplTest.java |  56 +--
 .../accumulo/core/data/KeyExtentTest.java       |   8 +-
 .../apache/accumulo/core/data/RangeTest.java    |  21 +-
 .../accumulo/core/file/rfile/RFileTest.java     |   4 +-
 .../core/iterators/IteratorUtilTest.java        |  11 +-
 .../iterators/system/MultiIteratorTest.java     |   6 +-
 .../ReplicationConfigurationUtilTest.java       |  12 +-
 .../core/replication/ReplicationSchemaTest.java |  14 +-
 .../apache/accumulo/core/util/MergeTest.java    |   2 +-
 .../simple/client/RandomBatchWriter.java        |   5 +-
 .../examples/simple/client/RowOperations.java   |  10 +-
 .../simple/mapreduce/TeraSortIngest.java        |   6 +-
 .../examples/simple/shard/ContinuousQuery.java  |   4 +-
 .../accumulo/server/client/BulkImporter.java    |   2 +-
 .../server/conf/ServerConfigurationFactory.java |   2 +-
 .../server/conf/TableConfiguration.java         |  16 +-
 .../apache/accumulo/server/fs/VolumeUtil.java   |   2 +-
 .../apache/accumulo/server/init/Initialize.java |   2 +-
 .../server/master/balancer/GroupBalancer.java   |   5 +-
 .../master/balancer/TableLoadBalancer.java      |   4 +-
 .../master/state/TabletStateChangeIterator.java |   9 +-
 .../accumulo/server/problems/ProblemReport.java |  36 +-
 .../problems/ProblemReportingIterator.java      |  12 +-
 .../tabletserver/LargestFirstMemoryManager.java |   9 +-
 .../org/apache/accumulo/server/util/Admin.java  |  12 +-
 .../server/util/CheckForMetadataProblems.java   |   2 +-
 .../server/util/FindOfflineTablets.java         |   6 +-
 .../server/util/MasterMetadataUtil.java         |   4 +-
 .../accumulo/server/util/MetadataTableUtil.java |  39 +-
 .../util/RemoveEntriesForMissingFiles.java      |   3 +-
 .../server/util/ReplicationTableUtil.java       |   6 +-
 .../accumulo/server/util/TableDiskUsage.java    |   3 +-
 .../accumulo/server/util/TabletIterator.java    |   7 +-
 .../server/client/BulkImporterTest.java         |  11 +-
 .../balancer/ChaoticLoadBalancerTest.java       |   6 +-
 .../balancer/DefaultLoadBalancerTest.java       |  12 +-
 .../master/balancer/GroupBalancerTest.java      |   2 +-
 .../master/balancer/TableLoadBalancerTest.java  |   6 +-
 .../server/master/state/MergeInfoTest.java      |  24 +-
 .../server/problems/ProblemReportTest.java      |  44 +--
 .../problems/ProblemReportingIteratorTest.java  |   4 +-
 .../accumulo/server/util/AdminCommandsTest.java |   2 +-
 .../server/util/ReplicationTableUtilTest.java   |   6 +-
 .../accumulo/gc/GarbageCollectionTest.java      |   4 +-
 .../java/org/apache/accumulo/master/Master.java |  39 +-
 .../master/MasterClientServiceHandler.java      |   2 +-
 .../accumulo/master/TabletGroupWatcher.java     |  24 +-
 .../master/replication/FinishedWorkUpdater.java |   4 +-
 .../master/replication/StatusMaker.java         |  10 +-
 .../accumulo/master/replication/WorkMaker.java  |   8 +-
 .../accumulo/master/state/MergeStats.java       |   2 +-
 .../accumulo/master/state/TableStats.java       |  13 +-
 .../accumulo/master/tableOps/CleanUp.java       |   3 +-
 .../master/tableOps/CompactionDriver.java       |   2 +-
 .../accumulo/master/tableOps/CopyFailed.java    |   3 +-
 .../master/tableOps/PopulateMetadata.java       |   3 +-
 .../master/tableOps/PopulateMetadataTable.java  |   2 +-
 .../accumulo/master/tableOps/TableRangeOp.java  |  10 +-
 .../master/tableOps/TableRangeOpWait.java       |   9 +-
 .../master/tableOps/WriteExportFiles.java       |   5 +-
 .../master/state/RootTabletStateStoreTest.java  |   3 +-
 .../monitor/servlets/TServersServlet.java       |   2 +-
 .../monitor/servlets/TablesServlet.java         |   4 +-
 .../org/apache/accumulo/monitor/util/Table.java |  20 +-
 .../org/apache/accumulo/tracer/TraceServer.java |  18 +-
 .../apache/accumulo/tserver/FileManager.java    |   6 +-
 .../apache/accumulo/tserver/TabletServer.java   |  29 +-
 .../compaction/MajorCompactionRequest.java      |   9 -
 .../accumulo/tserver/logger/LogReader.java      |   2 +-
 .../replication/AccumuloReplicaSystem.java      |   6 +-
 .../tserver/session/SessionManager.java         |  11 +-
 .../accumulo/tserver/tablet/Compactor.java      |   4 +-
 .../tserver/tablet/DatafileManager.java         |   6 +-
 .../accumulo/tserver/tablet/MinorCompactor.java |  12 +-
 .../apache/accumulo/tserver/tablet/Tablet.java  |   9 +-
 .../accumulo/tserver/AssignmentWatcherTest.java |   3 +-
 .../tserver/CheckTabletMetadataTest.java        |   6 +-
 .../tserver/LargestFirstMemoryManagerTest.java  |   4 +-
 .../DefaultCompactionStrategyTest.java          |   3 +-
 .../SizeLimitCompactionStrategyTest.java        |   3 +-
 .../ConfigurableCompactionStrategyTest.java     |   3 +-
 .../accumulo/tserver/log/LogEntryTest.java      |   2 +-
 .../tserver/log/SortedLogRecoveryTest.java      |   2 +-
 .../accumulo/tserver/logger/LogFileTest.java    |   2 +-
 .../replication/AccumuloReplicaSystemTest.java  |  14 +-
 .../java/org/apache/accumulo/test/CloneIT.java  |  18 +-
 .../accumulo/test/ConditionalWriterIT.java      |  22 +-
 .../org/apache/accumulo/test/LocatorIT.java     |   2 +-
 .../test/MasterRepairsDualAssignmentIT.java     |   4 +-
 .../accumulo/test/MetaConstraintRetryIT.java    |   3 +-
 .../MissingWalHeaderCompletesRecoveryIT.java    |   6 +-
 .../accumulo/test/QueryMetadataTable.java       |   2 +-
 .../apache/accumulo/test/SplitRecoveryIT.java   |   4 +-
 .../java/org/apache/accumulo/test/VolumeIT.java |   4 +-
 .../apache/accumulo/test/WrongTabletTest.java   |   2 +-
 .../continuous/ContinuousStatsCollector.java    |   3 +-
 .../accumulo/test/functional/CompactionIT.java  |   5 +-
 .../test/functional/MasterAssignmentIT.java     |   3 +-
 .../accumulo/test/functional/MergeIT.java       |   6 +-
 .../accumulo/test/functional/SplitIT.java       |   3 +-
 .../test/functional/SplitRecoveryIT.java        |   4 +-
 .../accumulo/test/functional/TableIT.java       |   3 +-
 .../functional/TabletStateChangeIteratorIT.java |   8 +-
 .../CloseWriteAheadLogReferencesIT.java         |   2 +-
 .../accumulo/test/master/MergeStateIT.java      |   2 +-
 .../metadata/MetadataBatchScanTest.java         |   2 +-
 .../performance/scan/CollectTabletStats.java    |   2 +-
 .../test/performance/thrift/NullTserver.java    |   3 +-
 .../accumulo/test/proxy/SimpleProxyBase.java    | 364 +++++++++----------
 .../RemoveCompleteReplicationRecordsIT.java     |  27 +-
 .../test/replication/ReplicationIT.java         |   5 +-
 .../ReplicationOperationsImplIT.java            |  46 +--
 .../replication/SequentialWorkAssignerIT.java   |  16 +-
 .../test/replication/StatusCombinerMacIT.java   |   5 +-
 .../test/replication/StatusMakerIT.java         |   6 +-
 .../replication/UnorderedWorkAssignerIT.java    |   4 +-
 ...UnusedWalDoesntCloseReplicationStatusIT.java |   4 +-
 146 files changed, 827 insertions(+), 905 deletions(-)
----------------------------------------------------------------------



Mime
View raw message