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/3c40b529 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3c40b529 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3c40b529 Branch: refs/heads/master Commit: 3c40b529bcf9fa96e96b07eae0f5e99c503a358d Parents: 7492d74 0d10bda Author: Christopher Tubbs <ctubb...@apache.org> Authored: Wed Apr 23 18:20:49 2014 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Wed Apr 23 18:20:49 2014 -0400 ---------------------------------------------------------------------- .../src/main/java/org/apache/accumulo/server/fs/VolumeUtil.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
