From: Sage Weil <sage@redhat.com>
Date: Thu, 8 Aug 2019 20:52:45 +0000 (-0500)
Subject: Merge PR #29493 into master
X-Git-Tag: v15.1.0~1928
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=8827bc1022b0c22c28113ab09e35c2c30f71c9b1;p=ceph-ci.git

Merge PR #29493 into master

* refs/pull/29493/head:
	qa/tasks/mgr/mgr_test_case: get mgrmap from 'mgr dump', not status
	qa/tasks/ceph_manager: no newlines in 'ceph -s' output
	mon: make mon summary more concise in 'ceph -s'
	mon/MgrStatMonitor: set initial service_map 'modified' to cluster mkfs
	mon: remove double-nesting of "osdmap" for ceph status
	mon/MgrMap: make print_summary (used by 'ceph -s') more concise

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
---

8827bc1022b0c22c28113ab09e35c2c30f71c9b1