From: Sage Weil <sage@redhat.com>
Date: Fri, 28 Feb 2020 09:17:39 +0000 (-0600)
Subject: Merge PR #33226 into master
X-Git-Tag: v15.1.1~203
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d27f512d1731988cf7f369559f2fc324f1592047;p=ceph.git

Merge PR #33226 into master

* refs/pull/33226/head:
	unittest_auth: update for new ms_*_mode semantics
	auth: treat mgr the same as mon when selecting auth mode

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

d27f512d1731988cf7f369559f2fc324f1592047