Merge "Disable nova bm file injection in undercloud"
authorJenkins <jenkins@review.openstack.org>
Wed, 23 Oct 2013 23:46:44 +0000 (23:46 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 23 Oct 2013 23:46:44 +0000 (23:46 +0000)

Trivial merge