Merge "Don't rely on provider_id for resource deletion"
authorJenkins <jenkins@review.openstack.org>
Sun, 13 Sep 2015 02:06:30 +0000 (02:06 +0000)
committerGerrit Code Review <review@openstack.org>
Sun, 13 Sep 2015 02:06:30 +0000 (02:06 +0000)

Trivial merge