Merge "Handle failure of carrier check in configure_safe_defaults()" into stable...
authorJenkins <jenkins@review.openstack.org>
Mon, 28 Aug 2017 19:01:51 +0000 (19:01 +0000)
committerGerrit Code Review <review@openstack.org>
Mon, 28 Aug 2017 19:01:51 +0000 (19:01 +0000)

Trivial merge