Merge branch '1.6.0-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a9f1767b Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a9f1767b Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a9f1767b Branch: refs/heads/master Commit: a9f1767b9dc8f399a2e9c7b7c5437de992c1fe8d Parents: 62661dc 62ce752 Author: Josh Elser <els...@apache.org> Authored: Mon Mar 24 16:36:58 2014 -0700 Committer: Josh Elser <els...@apache.org> Committed: Mon Mar 24 16:36:58 2014 -0700 ---------------------------------------------------------------------- .../org/apache/accumulo/server/fs/VolumeManagerImpl.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) ----------------------------------------------------------------------
