Updated openstack/openstack
Project: openstack/trove  edd84160574f5fb8a8de3dd25320b5c28fb23579
null
changing conductor logging levels

Running conductor in a log level below debug needs a little more
info to know what the instance id is from the log messages.

Change-Id: Ie657d480282b4fb1702827ebe5007e0d2ca9a0cc
Closes-Bug: #1306805
Updated openstack/openstack
Project: openstack/ceilometer  fd5d344b48a33a24454956f9582b90f7468db4a8
null
cleanup virt pollster code

apply minor fixes relating to comments in recently merged vmware
pollster.

Change-Id: I1fae3bfe31b84334164c3748df44003ca5705667