]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge PR #29493 into master
authorSage Weil <sage@redhat.com>
Thu, 8 Aug 2019 20:52:45 +0000 (15:52 -0500)
committerSage Weil <sage@redhat.com>
Thu, 8 Aug 2019 20:52:45 +0000 (15:52 -0500)
* 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>
1  2 
qa/tasks/ceph_manager.py

Simple merge