[Merge] ~freyes/ubuntu/+source/heat:upstream into ~ubuntu-openstack-dev/ubuntu/+source/heat:upstream

[mp+416271 at code.launchpad.net]

The proposal to merge ~freyes/ubuntu/+source/heat:upstream into ~ubuntu-openstack-dev/ubuntu/+source/heat:upstream has been updated.

    Status: Needs review => Merged

For more details, see:
https://code.launchpad.net/~freyes/ubuntu/+source/heat/+git/heat/+merge/416271
-- 
Your team Ubuntu OpenStack uploaders is subscribed to branch ~ubuntu-openstack-dev/ubuntu/+source/heat:upstream.