Merge branch '1.6.1-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7e81971f Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7e81971f Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7e81971f Branch: refs/heads/master Commit: 7e81971f4dba083c13715648d66cd2f40a5c8886 Parents: 996441f 5eceb10 Author: Josh Elser <els...@apache.org> Authored: Fri Jul 4 00:20:19 2014 -0400 Committer: Josh Elser <els...@apache.org> Committed: Fri Jul 4 00:20:19 2014 -0400 ---------------------------------------------------------------------- .../accumulo/server/fs/VolumeManagerImpl.java | 26 +++++- .../server/fs/VolumeManagerImplTest.java | 85 ++++++++++++++++++++ .../accumulo/master/TabletGroupWatcher.java | 6 +- 3 files changed, 114 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
