Merge "Deployed server bootstrap via Heat"
authorJenkins <jenkins@review.openstack.org>
Mon, 16 Jan 2017 19:54:50 +0000 (19:54 +0000)
committerGerrit Code Review <review@openstack.org>
Mon, 16 Jan 2017 19:54:50 +0000 (19:54 +0000)

Trivial merge