From: Sage Weil <sage@redhat.com>
Date: Sun, 8 Mar 2020 22:29:00 +0000 (-0500)
Subject: Merge PR #33792 into master
X-Git-Tag: v15.1.1~67
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f4ff4f96ec6d52ac62da56f71bfdd05bb1e96050;p=ceph.git

Merge PR #33792 into master

* refs/pull/33792/head:
	doc/cephadm: fix formatting for osd section
	doc/cephadm: update 'adding mons' section to suggest/prefer 'apply'
	doc/cephadm: fix formatting, typos
	mgr/cephadm: implement apply_mon
	mgr/cephadm: allow mon creation without explicit ip or addr
	mgr/cephadm: allow _apply_service to delete mon daemon's data
	mgr/cephadm: remove mon from monmap before removing mon
	mgr/cephadm: do not remove mon if it breaks quorum

Reviewed-by: Michael Fritch <mfritch@suse.com>
---

f4ff4f96ec6d52ac62da56f71bfdd05bb1e96050