From: Sage Weil <sage@newdream.net>
Date: Wed, 28 Apr 2021 18:26:07 +0000 (-0400)
Subject: Merge PR #40943 into master
X-Git-Tag: v17.1.0~2124
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=428d3df5888b51117d5f16b9eb68b77d7df575a1;p=ceph.git

Merge PR #40943 into master

* refs/pull/40943/head:
	mgr/cephadm: skip ok-to-stop for mons in upgrade if < 3 mons
	mgr/cephadm: don't allow upgrade start with less than 2 mgrs

Reviewed-by: Michael Fritch <mfritch@suse.com>
---

428d3df5888b51117d5f16b9eb68b77d7df575a1