]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #39737 into pacific
authorSage Weil <sage@newdream.net>
Thu, 4 Mar 2021 21:08:22 +0000 (15:08 -0600)
committerSage Weil <sage@newdream.net>
Thu, 4 Mar 2021 21:08:22 +0000 (15:08 -0600)
* refs/pull/39737/head:
mgr/DaemonServer: osd ok-to-stop: return json when there are unknown PGs
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>
1  2 
src/mgr/DaemonServer.cc

Simple merge