From: Sage Weil <sage@redhat.com>
Date: Wed, 27 Feb 2019 22:59:04 +0000 (-0600)
Subject: Merge PR #26640 into master
X-Git-Tag: v14.1.1~110
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=478b212bf99dfcb435f5080a436af13d1de675ef;p=ceph.git

Merge PR #26640 into master

* refs/pull/26640/head:
	mon/OSDMonitor: remove old v1 addrs when converting blacklist to new TYPE_ANY form

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

478b212bf99dfcb435f5080a436af13d1de675ef