Merge branch '1.5.2-SNAPSHOT' into 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/9677fd46 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9677fd46 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/9677fd46 Branch: refs/heads/master Commit: 9677fd46b3f8af4e378969e4107cfd3e57fb4c6a Parents: 4df3959 0dc92ca Author: Mike Drob <md...@cloudera.com> Authored: Mon Mar 24 13:19:37 2014 -0400 Committer: Mike Drob <md...@cloudera.com> Committed: Mon Mar 24 13:19:37 2014 -0400 ---------------------------------------------------------------------- .../org/apache/accumulo/core/util/Stat.java | 82 +++++++++++--------- .../org/apache/accumulo/core/util/StatTest.java | 75 ++++++++++++++++++ 2 files changed, 122 insertions(+), 35 deletions(-) ----------------------------------------------------------------------