Merge branch '1.7' into 1.8
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4a5f2763 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4a5f2763 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4a5f2763 Branch: refs/heads/1.8 Commit: 4a5f2763b9321c11f2fab86c47e72421a6c1cb96 Parents: 8d954e2 7f12433 Author: Dylan Hutchison <dhutc...@cs.washington.edu> Authored: Wed Jun 8 19:24:32 2016 -0700 Committer: Dylan Hutchison <dhutc...@cs.washington.edu> Committed: Wed Jun 8 19:24:32 2016 -0700 ---------------------------------------------------------------------- .../org/apache/accumulo/tserver/metrics/TabletServerMBean.java | 2 +- .../apache/accumulo/tserver/metrics/TabletServerMBeanImpl.java | 2 +- .../accumulo/tserver/metrics/TabletServerMetricsUtil.java | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) ----------------------------------------------------------------------
