git-server-git.apps.pok.os.sepia.ceph.com Git

author	David Zafman <dzafman@redhat.com>
	Fri, 7 Jul 2017 17:53:41 +0000 (10:53 -0700)
committer	Nathan Cutler <ncutler@suse.com>
	Tue, 18 Jul 2017 20:19:42 +0000 (22:19 +0200)
commit	c6542ac7e6408f26ce7376d3a58eed0661a17099
tree	814f1a187eed7130c9b64de01cf42ae713a767f1	tree \| snapshot
parent	2f26f8cbd3e81700c42202f8d933f1576772e212	commit \| diff

mon: Fix status output warning for mon_warn_osd_usage_min_max_delta

Fixes: http://tracker.ceph.com/issues/20544
Caued by: 489e810c37ed6fb9d32d1015634041a577501ee4

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 56f9808016ab289bdc0ce7cfbb0503c78b509593)

Conflicts:
    src/mon/PGMap.cc:
        kraken has no daa0793c393a21bd2dd2ec52a0efd181e1032400 so we manually
        apply the changes from 56f9808016ab289bdc0ce7cfbb0503c78b509593 to
        src/mon/PGMonitor.cc instead of to src/mon/PGMap.cc