Updated openstack/openstack
Project: openstack/ceilometer  4d35b216585c3a9fcc57b2768565d0913a7788bd
Merge "Per pipeline pluggable resource discovery"