Merge "get-occ-config.sh replace deprecated heat commands"
authorJenkins <jenkins@review.openstack.org>
Wed, 30 Nov 2016 16:11:52 +0000 (16:11 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 30 Nov 2016 16:11:52 +0000 (16:11 +0000)

Trivial merge