]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #40203 into master
authorSage Weil <sage@newdream.net>
Mon, 22 Mar 2021 20:54:19 +0000 (16:54 -0400)
committerSage Weil <sage@newdream.net>
Mon, 22 Mar 2021 20:54:19 +0000 (16:54 -0400)
* refs/pull/40203/head:
mgr/cephadm: retry after JSONDecodeError in wait_for_mgr_restart()

Reviewed-by: Sage Weil <sage@redhat.com>

Trivial merge