[Merge] ~james-page/ubuntu/+source/masakari:master into ~ubuntu-openstack-dev/ubuntu/+source/masakari:master

[mp+459067 at code.launchpad.net]

The proposal to merge ~james-page/ubuntu/+source/masakari:master into ~ubuntu-openstack-dev/ubuntu/+source/masakari:master has been updated.

    Status: Needs review => Merged

For more details, see:
https://code.launchpad.net/~james-page/ubuntu/+source/masakari/+git/masakari/+merge/459067
-- 
Your team Ubuntu OpenStack uploaders is requested to review the proposed merge of ~james-page/ubuntu/+source/masakari:master into ~ubuntu-openstack-dev/ubuntu/+source/masakari:master.