Merge branch '1.6.1-SNAPSHOT'
Conflicts:
server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/cf8bafa7
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/cf8bafa7
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/cf8bafa7
Branch: refs/heads/ACCUMULO-378
Commit: cf8bafa758a9cbbb8b1cd3208c2a9f7e461ce63a
Parents: 3bb70a6 31aea2a
Author: Sean Busbey <[email protected]>
Authored: Thu Jun 12 15:51:58 2014 -0400
Committer: Sean Busbey <[email protected]>
Committed: Thu Jun 12 15:51:58 2014 -0400
----------------------------------------------------------------------
.../accumulo/server/fs/VolumeManagerImpl.java | 11 ++++++++--
.../server/master/recovery/RecoveryPath.java | 7 +++++--
.../gc/GarbageCollectWriteAheadLogs.java | 8 ++++++--
.../gc/GarbageCollectWriteAheadLogsTest.java | 13 +++++++++---
.../apache/accumulo/tserver/log/DfsLogger.java | 21 +++++++++++++++++++-
.../apache/accumulo/tserver/tablet/Tablet.java | 15 ++++++++++----
6 files changed, 61 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/cf8bafa7/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeManagerImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/cf8bafa7/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
----------------------------------------------------------------------