From: Sage Weil <sage@redhat.com>
Date: Fri, 1 Mar 2019 20:36:35 +0000 (-0600)
Subject: Merge PR #26692 into master
X-Git-Tag: v14.1.1~82
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b3eb525471ff3d5b787fea48450f41772f29fc2b;p=ceph.git

Merge PR #26692 into master

* refs/pull/26692/head:
	test/test_ipaddr: added test for pick_address when ipv4 and ipv6 are enabled
	common/pick_address: improves log message when no IP is found
	pick_address: error out in dual stack mode if both addr types cannot be provided

Reviewed-by: Sage Weil <sage@redhat.com>
---

b3eb525471ff3d5b787fea48450f41772f29fc2b