From: Sage Weil <sage@redhat.com>
Date: Tue, 8 Jan 2019 17:19:21 +0000 (-0600)
Subject: Merge PR #25835 into master
X-Git-Tag: v14.1.0~465
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=b8e475af0c4beb1e1e59ff3b75eb62c2642ea64a;p=ceph-ci.git

Merge PR #25835 into master

* refs/pull/25835/head:
	mgr/ServiceMap: print daemon addr in legacy format

Reviewed-by: Ricardo Dias <rdias@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
---

b8e475af0c4beb1e1e59ff3b75eb62c2642ea64a