From: Sage Weil <sage@newdream.net>
Date: Mon, 22 Mar 2021 20:54:19 +0000 (-0400)
Subject: Merge PR #40203 into master
X-Git-Tag: v17.1.0~2518
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=110c7a6e0f5eb0ebe1e172b647fd36ffa3bb8146;p=ceph.git

Merge PR #40203 into master

* refs/pull/40203/head:
	mgr/cephadm: retry after JSONDecodeError in wait_for_mgr_restart()

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

110c7a6e0f5eb0ebe1e172b647fd36ffa3bb8146