From: Sage Weil <sage@newdream.net>
Date: Sat, 27 Feb 2021 15:15:27 +0000 (-0500)
Subject: Merge PR #39455 into master
X-Git-Tag: v17.1.0~2808
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5e197a21e61b6d7e4f41a330cd63bc787164937d;p=ceph.git

Merge PR #39455 into master

* refs/pull/39455/head:
	doc/man/8/ceph: document --max option
	src/test/osd/safe-to-destroy: adjust test
	ceph: print command output to stdout even on error
	mgr/DaemonServer: include details in 'osd ok-to-stop' output
	mgr: add --max <n> to 'osd ok-to-stop' command
	mgr: relax osd ok-to-stop condition on degraded pgs

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

5e197a21e61b6d7e4f41a330cd63bc787164937d