Merge branch '1.5.1-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/896c49f5 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/896c49f5 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/896c49f5 Branch: refs/heads/master Commit: 896c49f523cf24f2a86d3a4dd12b069a8e4d3544 Parents: 7f4449e b7786fc Author: Eric Newton <eric.new...@gmail.com> Authored: Tue Oct 22 15:43:28 2013 -0400 Committer: Eric Newton <eric.new...@gmail.com> Committed: Tue Oct 22 15:43:28 2013 -0400 ---------------------------------------------------------------------- .../apache/accumulo/server/metrics/MetricsConfiguration.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
