Merge "Enable proxy headers parsing for Ceilometer"
authorJenkins <jenkins@review.openstack.org>
Thu, 13 Oct 2016 16:31:56 +0000 (16:31 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 13 Oct 2016 16:31:56 +0000 (16:31 +0000)

Trivial merge