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 2014/10/03 22:40:22 UTC
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/accumulo
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/c217a7d6
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c217a7d6
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c217a7d6
Branch: refs/heads/master
Commit: c217a7d60b5dc651633ae4ee28e123341288befc
Parents: 5cbcffb c9eaa7f
Author: Eric C. Newton <er...@gmail.com>
Authored: Fri Oct 3 16:40:16 2014 -0400
Committer: Eric C. Newton <er...@gmail.com>
Committed: Fri Oct 3 16:40:16 2014 -0400
----------------------------------------------------------------------
.../org/apache/accumulo/core/conf/Property.java | 68 ++++--
.../accumulo/server/log/SortedLogState.java | 66 ++++++
.../master/recovery/RecoveryManager.java | 3 +-
.../apache/accumulo/tserver/TabletServer.java | 3 +-
.../tserver/TabletServerResourceManager.java | 2 +-
.../tserver/compaction/CompactionPlan.java | 32 +++
.../tserver/compaction/WriteParameters.java | 6 +
.../apache/accumulo/tserver/log/DfsLogger.java | 149 +++++++------
.../apache/accumulo/tserver/log/LogSorter.java | 36 ++-
.../accumulo/tserver/log/MultiReader.java | 34 +--
.../tserver/log/TabletServerLogger.java | 8 +-
.../accumulo/tserver/logger/LogReader.java | 13 +-
.../replication/AccumuloReplicaSystem.java | 27 ++-
.../apache/accumulo/tserver/tablet/Tablet.java | 12 +-
.../tserver/compaction/CompactionPlanTest.java | 87 ++++++++
.../tserver/log/SortedLogRecoveryTest.java | 3 +-
.../tserver/log/TestUpgradePathForWALogs.java | 3 +-
.../MissingWalHeaderCompletesRecoveryIT.java | 217 +++++++++++++++++++
.../functional/BulkSplitOptimizationIT.java | 11 +-
.../functional/ConfigurableCompactionIT.java | 34 +++
test/src/test/resources/TestCompactionStrat.jar | Bin 0 -> 1681 bytes
21 files changed, 684 insertions(+), 130 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/c217a7d6/core/src/main/java/org/apache/accumulo/core/conf/Property.java
----------------------------------------------------------------------