From: Sage Weil <sage@redhat.com>
Date: Fri, 3 Aug 2018 15:56:36 +0000 (-0500)
Subject: Merge PR #22717 into master
X-Git-Tag: v14.0.1~684
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dd475adea114cf451e4206ac33aa1c00a82dcad7;p=ceph.git

Merge PR #22717 into master

* refs/pull/22717/head:
	mgr/DaemonServer: osd purge: accept --yes-i-really-mean-it too
	mon,mgr: guard 'osd purge' with safe-to-destroy check
	mon/MonCommands: hide 'osd destroy-actual'
	mon/MonCommands: add HIDDEN flag
	mon,mgr: guard 'osd destroy' with 'osd safe-to-destroy' check
	mon/MonCommand: deprecate 'osd rm'
	mon/OSDMonitor: point users at 'ceph osd safe-to-destroy' for purge|destroy

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
---

dd475adea114cf451e4206ac33aa1c00a82dcad7