Merge "Drop un-needed 'else' in noop_resource"
authorJenkins <jenkins@review.openstack.org>
Mon, 5 Jun 2017 16:12:57 +0000 (16:12 +0000)
committerGerrit Code Review <review@openstack.org>
Mon, 5 Jun 2017 16:12:57 +0000 (16:12 +0000)

Trivial merge