From: Sage Weil <sage@redhat.com>
Date: Tue, 19 Feb 2019 14:31:23 +0000 (-0600)
Subject: Merge PR #26470 into master
X-Git-Tag: v14.1.0~58
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=08a05e21c663ab69b8969f59902091925e3fde25;p=ceph.git

Merge PR #26470 into master

* refs/pull/26470/head:
	mgr/MgrStandby: include addrs in metadata

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
---

08a05e21c663ab69b8969f59902091925e3fde25