]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge PR #40943 into master
authorSage Weil <sage@newdream.net>
Wed, 28 Apr 2021 18:26:07 +0000 (14:26 -0400)
committerSage Weil <sage@newdream.net>
Wed, 28 Apr 2021 18:26:07 +0000 (14:26 -0400)
commit428d3df5888b51117d5f16b9eb68b77d7df575a1
treecf1e38b35d19eb5e6fd3b6e1191deba1ae2bc18d
parent1b70eed08879696a229865e445ddf351137c3302
parent4c7bfdbdd133820a1c0e8d129980ed810a77168d
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>