Merge branch '1.6'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/299e06d7 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/299e06d7 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/299e06d7 Branch: refs/heads/master Commit: 299e06d7356c6bd76ed3e286a52358c5768f253e Parents: a542e45 2ca9103 Author: Josh Elser <els...@apache.org> Authored: Tue Jan 13 11:58:36 2015 -0500 Committer: Josh Elser <els...@apache.org> Committed: Tue Jan 13 11:58:36 2015 -0500 ---------------------------------------------------------------------- .../apache/accumulo/core/volume/VolumeImpl.java | 30 ++++++- .../accumulo/core/volume/VolumeImplTest.java | 90 ++++++++++++++++++++ .../accumulo/server/fs/VolumeManagerImpl.java | 6 +- 3 files changed, 120 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/299e06d7/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeManagerImpl.java ----------------------------------------------------------------------
