]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4ab8432 7a47ba6)
Merge PR #26692 into master
authorSage Weil <sage@redhat.com>
Fri, 1 Mar 2019 20:36:35 +0000 (14:36 -0600)
committerSage Weil <sage@redhat.com>
Fri, 1 Mar 2019 20:36:35 +0000 (14:36 -0600)
* 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>

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.