Merge branch '1.6'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/729b2c56 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/729b2c56 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/729b2c56 Branch: refs/heads/master Commit: 729b2c560b7960f5b0fe5384d8e2ce0c929f7649 Parents: 07040f1 ac44627 Author: Eric C. Newton <eric.new...@gmail.com> Authored: Tue Feb 10 14:23:57 2015 -0500 Committer: Eric C. Newton <eric.new...@gmail.com> Committed: Tue Feb 10 14:23:57 2015 -0500 ---------------------------------------------------------------------- CHANGES | 20 +++++++++++++++++--- .../accumulo/server/util/TableDiskUsage.java | 4 +++- 2 files changed, 20 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/729b2c56/server/base/src/main/java/org/apache/accumulo/server/util/TableDiskUsage.java ----------------------------------------------------------------------
