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/1fe48e11 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1fe48e11 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1fe48e11 Branch: refs/heads/master Commit: 1fe48e11222e1923943fb274ea78fb27407ac326 Parents: ced3293 1a33f6d Author: Bill Havanki <bhava...@cloudera.com> Authored: Mon Jun 9 17:02:21 2014 -0400 Committer: Bill Havanki <bhava...@cloudera.com> Committed: Mon Jun 9 17:02:21 2014 -0400 ---------------------------------------------------------------------- .../main/java/org/apache/accumulo/server/fs/VolumeManagerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
