]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #39455 into master
authorSage Weil <sage@newdream.net>
Sat, 27 Feb 2021 15:15:27 +0000 (10:15 -0500)
committerSage Weil <sage@newdream.net>
Sat, 27 Feb 2021 15:15:27 +0000 (10:15 -0500)
* 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>

Trivial merge