]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #39028 into master
authorSage Weil <sage@newdream.net>
Tue, 26 Jan 2021 17:22:50 +0000 (11:22 -0600)
committerSage Weil <sage@newdream.net>
Tue, 26 Jan 2021 17:22:50 +0000 (11:22 -0600)
* refs/pull/39028/head:
cephadm: retry for 30s instead of 10s
cephadm: try 'mgr stat' before 'mgr dump' to get the epoch
mon: add 'mgr stat' command

Reviewed-by: Sebastian Wagner <swagner@suse.com>

Trivial merge