]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #25835 into master
authorSage Weil <sage@redhat.com>
Tue, 8 Jan 2019 17:19:21 +0000 (11:19 -0600)
committerSage Weil <sage@redhat.com>
Tue, 8 Jan 2019 17:19:21 +0000 (11:19 -0600)
* 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>

Trivial merge