From: Sage Weil <sage@redhat.com>
Date: Fri, 25 Oct 2019 14:11:36 +0000 (-0500)
Subject: Merge PR #31138 into master
X-Git-Tag: v15.1.0~1162
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=23d22a27819f07db4bc563efa4599dd449d84aa1;p=ceph.git

Merge PR #31138 into master

* refs/pull/31138/head:
	mon: fix tell to hybrid octopus/pre-octopus mons

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
---

23d22a27819f07db4bc563efa4599dd449d84aa1