Merge ~freyes/ubuntu/+source/ceilometer:upstream into ~ubuntu-openstack-dev/ubuntu/+source/ceilometer:upstream

.zuul.yaml (+2/-4)
AUTHORS (+2/-6)
ChangeLog (+5/-45)
PKG-INFO (+4/-4)
README.rst (+3/-3)
babel.cfg (+2/-0)
bindep.txt (+3/-0)
ceilometer.egg-info/PKG-INFO (+4/-4)
ceilometer.egg-info/SOURCES.txt (+1/-4)
ceilometer.egg-info/entry_points.txt (+0/-2)
ceilometer.egg-info/requires.txt (+9/-8)
ceilometer/compute/discovery.py (+13/-5)
ceilometer/compute/pollsters/__init__.py (+1/-1)
ceilometer/compute/pollsters/net.py (+0/-14)
ceilometer/compute/virt/hyperv/inspector.py (+8/-5)
ceilometer/compute/virt/inspector.py (+2/-6)
ceilometer/compute/virt/libvirt/inspector.py (+4/-29)
ceilometer/compute/virt/libvirt/utils.py (+0/-34)
ceilometer/compute/virt/vmware/inspector.py (+3/-2)
ceilometer/compute/virt/xenapi/inspector.py (+1/-11)
ceilometer/declarative.py (+3/-2)
ceilometer/event/converter.py (+2/-1)
ceilometer/event/models.py (+5/-4)
ceilometer/event/trait_plugins.py (+4/-2)
ceilometer/gnocchi_client.py (+2/-2)
ceilometer/hardware/inspector/base.py (+4/-1)
ceilometer/hardware/inspector/snmp.py (+5/-5)
ceilometer/hardware/pollsters/generic.py (+2/-1)
ceilometer/hardware/pollsters/util.py (+1/-1)
ceilometer/ipmi/platform/intel_node_manager.py (+3/-1)
ceilometer/ipmi/pollsters/node.py (+3/-1)
ceilometer/locale/en_GB/LC_MESSAGES/ceilometer.po (+2/-11)
ceilometer/locale/ko_KR/LC_MESSAGES/ceilometer.po (+3/-23)
ceilometer/meter/notifications.py (+5/-3)
ceilometer/network/services/lbaas.py (+3/-1)
ceilometer/network/statistics/__init__.py (+4/-2)
ceilometer/network/statistics/driver.py (+4/-1)
ceilometer/network/statistics/opencontrail/client.py (+5/-4)
ceilometer/network/statistics/opencontrail/driver.py (+1/-1)
ceilometer/network/statistics/opendaylight/client.py (+6/-3)
ceilometer/network/statistics/opendaylight/driver.py (+8/-6)
ceilometer/objectstore/rgw.py (+1/-1)
ceilometer/objectstore/rgw_client.py (+1/-2)
ceilometer/objectstore/swift.py (+1/-1)
ceilometer/pipeline/base.py (+3/-1)
ceilometer/polling/discovery/non_openstack_credentials_discovery.py (+1/-1)
ceilometer/polling/dynamic_pollster.py (+4/-4)
ceilometer/polling/manager.py (+4/-3)
ceilometer/polling/plugin_base.py (+5/-2)
ceilometer/publisher/__init__.py (+3/-1)
ceilometer/publisher/file.py (+1/-1)
ceilometer/publisher/gnocchi.py (+13/-11)
ceilometer/publisher/http.py (+1/-1)
ceilometer/publisher/messaging.py (+4/-2)
ceilometer/publisher/monasca.py (+2/-1)
ceilometer/publisher/monasca_data_filter.py (+2/-1)
ceilometer/publisher/utils.py (+11/-9)
ceilometer/publisher/zaqar.py (+1/-1)
ceilometer/sample.py (+3/-2)
ceilometer/tests/base.py (+2/-1)
ceilometer/tests/unit/compute/pollsters/test_location_metadata.py (+2/-1)
ceilometer/tests/unit/compute/pollsters/test_net.py (+5/-32)
ceilometer/tests/unit/compute/test_discovery.py (+0/-28)
ceilometer/tests/unit/event/test_converter.py (+2/-1)
ceilometer/tests/unit/event/test_endpoint.py (+3/-1)
ceilometer/tests/unit/hardware/inspector/test_snmp.py (+2/-1)
ceilometer/tests/unit/hardware/pollsters/test_generic.py (+3/-1)
ceilometer/tests/unit/ipmi/platform/test_intel_node_manager.py (+12/-6)
ceilometer/tests/unit/ipmi/pollsters/base.py (+3/-1)
ceilometer/tests/unit/meter/test_notifications.py (+3/-1)
ceilometer/tests/unit/network/statistics/opencontrail/test_driver.py (+1/-1)
ceilometer/tests/unit/network/statistics/opendaylight/test_client.py (+3/-2)
ceilometer/tests/unit/network/statistics/opendaylight/test_driver.py (+15/-13)
ceilometer/tests/unit/pipeline_base.py (+3/-1)
ceilometer/tests/unit/polling/test_dynamic_pollster.py (+2/-2)
ceilometer/tests/unit/polling/test_non_openstack_dynamic_pollster.py (+3/-3)
ceilometer/tests/unit/publisher/test_gnocchi.py (+3/-22)
ceilometer/tests/unit/publisher/test_http.py (+1/-1)
ceilometer/tests/unit/publisher/test_prometheus.py (+1/-1)
ceilometer/tests/unit/publisher/test_zaqar.py (+1/-1)
ceilometer/tests/unit/test_bin.py (+7/-3)
ceilometer/tests/unit/test_notification.py (+5/-2)
ceilometer/tests/unit/volume/test_cinder.py (+0/-2)
ceilometer/volume/cinder.py (+0/-1)
dev/null (+0/-6)
lower-constraints.txt (+13/-10)
releasenotes/source/index.rst (+0/-1)
releasenotes/source/locale/en_GB/LC_MESSAGES/releasenotes.po (+2/-16)
requirements.txt (+9/-8)
setup.cfg (+18/-6)
test-requirements.txt (+0/-1)
tools/send_test_data.py (+2/-1)
tox.ini (+6/-9)