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/81ab2d9c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/81ab2d9c Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/81ab2d9c Branch: refs/heads/master Commit: 81ab2d9c7989a11a5dc21818cc7e44f3255c7ba8 Parents: 16979a0 b45313b Author: Keith Turner <ktur...@apache.org> Authored: Tue Feb 25 18:22:38 2014 -0500 Committer: Keith Turner <ktur...@apache.org> Committed: Tue Feb 25 18:22:38 2014 -0500 ---------------------------------------------------------------------- .../apache/accumulo/server/ServerConstants.java | 4 +-- .../apache/accumulo/server/fs/VolumeUtil.java | 26 +++++++++++++------- 2 files changed, 19 insertions(+), 11 deletions(-) ----------------------------------------------------------------------
