From: Sage Weil <sage@redhat.com>
Date: Sat, 22 Sep 2018 15:28:39 +0000 (-0500)
Subject: Merge PR #24202 into master
X-Git-Tag: v14.0.1~204
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=f90edeb11043de03d6ed076b570ca22605215bc1;p=ceph.git

Merge PR #24202 into master

* refs/pull/24202/head:
	mon/MonClient: fix wait for monmap+config is non-cephx case

Reviewed-by: Mark Nelson <mnelson@redhat.com>
---

f90edeb11043de03d6ed076b570ca22605215bc1