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/ff785d34 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ff785d34 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ff785d34 Branch: refs/heads/master Commit: ff785d34303300b470cf0c477664351d48fe3e2a Parents: 3af9e60 5681c40 Author: Eric C. Newton <eric.new...@gmail.com> Authored: Thu Jul 17 13:48:48 2014 -0400 Committer: Eric C. Newton <eric.new...@gmail.com> Committed: Thu Jul 17 13:48:48 2014 -0400 ---------------------------------------------------------------------- .../java/org/apache/accumulo/server/fs/VolumeManagerImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
