From: Sage Weil <sage@redhat.com>
Date: Tue, 20 Nov 2018 12:49:54 +0000 (-0600)
Subject: Merge PR #25125 into master
X-Git-Tag: v14.1.0~868
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=d7ed1ccf48839a61578f37ffef50b7712dcdaf04;p=ceph-ci.git

Merge PR #25125 into master

* refs/pull/25125/head:
	mon: require keyring even if cephx is optional

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

d7ed1ccf48839a61578f37ffef50b7712dcdaf04