From: Yuri Weinstein <yweinste@redhat.com>
Date: Mon, 23 Dec 2019 20:26:01 +0000 (-0800)
Subject: Merge pull request #32028 from smithfarm/wip-43140-nautilus
X-Git-Tag: v14.2.8~28^2~2^2~8
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fd2fdc3e788d04a6ab2042decebf4fc032abd0a0;p=ceph.git

Merge pull request #32028 from smithfarm/wip-43140-nautilus

nautilus: core: mon: keep v1 address type when explicitly set

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Ricardo Dias <rdias@suse.com>
---

fd2fdc3e788d04a6ab2042decebf4fc032abd0a0