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/bfe39f61 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/bfe39f61 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/bfe39f61 Branch: refs/heads/master Commit: bfe39f61126200921f9ff2fb97490ea20448173a Parents: 996fe11 b353a24 Author: Josh Elser <els...@apache.org> Authored: Wed Jan 22 23:33:40 2014 -0500 Committer: Josh Elser <els...@apache.org> Committed: Wed Jan 22 23:33:40 2014 -0500 ---------------------------------------------------------------------- .../accumulo/core/util/shell/commands/DUCommand.java | 12 +++++++----- .../java/org/apache/accumulo/test/ShellServerIT.java | 6 +++++- 2 files changed, 12 insertions(+), 6 deletions(-) ----------------------------------------------------------------------
