Reviewed:  https://review.openstack.org/332417
Committed: https://git.openstack.org/cgit/openstack/ceilometer/commit/?id=cd1004c8c6855892d5259bc18e2f819317b0c3df
Submitter: Jenkins
Branch:    master

commit f7e27a2cf6a8ad084f36575a05a856cdbd9e528c
Author: Julien Danjou <email address hidden>
Date:   Wed Jun 1 10:23:51 2016 +0200

    dispacher/gnocchi: measures sent fix logging
    
    Currently, the logging is only done when measures are posted on retry. If it
    works on the first call, no logging is done. This can be confusing for users
    that try to debug the Gnocchi dispatcher.
    
    Change-Id: Ife7879fe0c153cec1a79c7d57529fda82b7b7c16

commit 5976031a7e6bd0bea6713f96ec7f892b945f9f86
Author: Ken'ichi Ohmichi <email address hidden>
Date:   Mon Jun 6 14:35:28 2016 +0900

    Copy images_client from tempest + Correct concurrency of gabbi 1.22.0
    
    Now the gate test of ceilometer is broken, because the ceilometer test
    is using nonstable tempest interfaces and these interfaces are changed.
    QA team defines interfaces which are not under tempest.lib as unstable
    clearly according to
    
    https://github.com/openstack/tempest/blob/master/doc/source/library.rst#stability
    
    So current test way is against the QA policy, so here is a workaround.
    Copy&paste is not good, almost wrong. However, if still continuing the
    tests, it would be a nice option to copy&paste and pass the gate test.
    After QA team defines stable interfaces, that is a nice time to switch
    using the stable interfaces with removing this copy&paste code.
    
    Closes-Bug: #1589426
    
    Depends-On: I3abd9049560ee507b3610ab482c697a239f13a3b
    (cherry picked from commit 6c0b97b1e6fc03bdf84bf9b888761bd22ea0ad58)
    
    +
    
    When running gabbi under testr, concurrency grouping is controlled
    by a regex in .testr.conf. A module name change in gabbi 1.22.0
    inadvertently broke the grouping. This change should work for
    old and new versions.
    
    (cherry picked from commit 8fcbc8de4ea878bdec1ef8754eaf965e176854b3)
    
    Change-Id: I30266f1b690ea105511d9b1162755bcc85e2e69a

commit 9c08a89fe2dec2965bc63764b95d68fc1b1f12c3
Author: ZhiQiang Fan <email address hidden>
Date:   Thu Jun 2 20:19:28 2016 +0800

    catch DriverLoadFailure for get_transport optional
    
    new oslo.messaging 5.2.0 release will raise
    oslo_messaging.transport.DriverLoadFailure if no existent transport
    driver, hence breaks our code and unit test as well.
    
    This patch fixes it by adding DriverLoadFailure to catch list.
    
    Also:
    
    tempest: import ImagesClient as ImagesClientV2
    
    This commit [1] renamed ImagesClientV2 to ImagesClient so Ceilometer
    Tempest tests do not work anymore.
    
    [1] https://github.com/openstack/tempest/commit/2fea405bd6ea8674c8daaf8ebb788ae33d52c976
    
    Change-Id: I02b5d1b3f4a9169cbf428a5eff9c6705494741af
    Closes-Bug: #1588151
    (cherry picked from commit d7f8ce94e433da8af3660ecf52715a04c221fde5)
    (cherry picked from commit f6b2406fffdd4deae508b9f251691fe9b70cb1ee)

commit 7951eb5edff433d12be7fe16ffbaa6ea140b37bf
Author: ZhiQiang Fan <email address hidden>
Date:   Sun May 22 08:56:56 2016 +0800

    enable swift pollsters poll data for specific region
    
    Currently swift pollsters only poll data from first region, which
    is bad for multiple regions scenario.
    
    This patch enables poll swift data for specific region. And improves
    log message and promotes the log level to INFO, now it looks like:
    
        Swift endpoint not found: public endpoint for object-store
        service in RegionTwo region not found
    
    Change-Id: Ifffb33ba1174a1a54f0ce1c4614bcd35d57ea4c3
    Closes-Bug: #1584364
    (cherry picked from commit 1610935ee3c00105df0e3038d249301e4627c381)

commit 9d2864fa04d874d6923322e362c53d55a4a5400d
Author: OpenStack Proposal Bot <email address hidden>
Date:   Fri May 20 07:19:43 2016 +0000

    Imported Translations from Zanata
    
    For more information about this automatic import see:
    https://wiki.openstack.org/wiki/Translations/Infrastructure
    
    Change-Id: I5e06b8fa21b79beedfd68b7668c9470be4c9244c

commit 1c0b83cbbb2eace581ad86c42e7e60f0d0537bf2
Author: Emilien Macchi <email address hidden>
Date:   Wed May 18 16:36:42 2016 +0200

    tempest_plugin: drop telemetry decorator
    
    Since [1], 'telemetry' service does not exist and Tempest plugin is now
    broken:
    
    InvalidServiceTag: Invalid service tag
    Details: telemetry is not a valid service
    
    This patch update the test_object_storage_telemetry_middleware test to
    match with the Tempest cleanup.
    
    [1] https://github.com/openstack/tempest/commit/e4796f8de446aaaafa83902d1fb2d613331436cf
    
    Change-Id: I2ae71b722826a4e377a4926c943d1dbce3b1ed9f
    (cherry picked from commit aa32401c32ab41ec202ab8a440e22046e8c827c4)

commit 9ba3c494042b6d77a38a95978579363c27882430
Author: OpenStack Proposal Bot <email address hidden>
Date:   Wed May 18 13:42:54 2016 +0000

    Updated from global requirements
    
    Change-Id: I07d21892a14818a6cef459ef0d73e3d7ee877987

commit 9cf0397973650d872665433721739bf8210f8dd9
Author: ZhiQiang Fan <email address hidden>
Date:   Wed Apr 27 23:46:19 2016 +0800

    [Trivial] Update Neutron resource status list
    
    According to https://github.com/openstack/neutron/blob/master/neutron/plugins/common/constants.py
    there are more status values than the list we currently use, we
    should update it, otherwise volume will be default -1
    
    Note: update unit test code because we recognize new status now.
    
    Change-Id: Ic6a42fb8a77c6e4fa7ce41cb16ab021cf77f567c
    (cherry picked from commit c6022ffcee8a202aebda41681e3b32321fbbed85)

commit 75c48c06abd28fbb52315411651ecbcdeb73b1d0
Author: ZhiQiang Fan <email address hidden>
Date:   Tue May 10 18:47:13 2016 +0800

    fix CI failure due to oslo.messaging 5.0.0
    
    Recently, oslo.messaging does a refactor [1] which causes
    get_batch_notification_listener returns a new type
    BatchNotificationServer instead of previous MessageHandlingServer,
    they have different attributes, so our test code which relies on
    MessageHandlingServer fails in CI gate.
    
    This patch makes test code not rely on oslo.messaging details.
    
    [1] https://github.com/openstack/oslo.messaging/commit/990d894eaf0d18941b56d89bff2bca51de375640
    
    Conflicts:
    	ceilometer/tests/functional/test_notification.py
    
    Change-Id: Id588bb4c22ac819617c87de021cdf580c4e0d0f5
    Closes-Bug: #1580930
    (cherry picked from commit 23d5c9f648d8352aa205fbe46ba9796a5424874f)

commit 6292e0e42b8d4602e08a876a53141c3ddbdcbb58
Author: Kirill Bespalov <email address hidden>
Date:   Wed Apr 20 17:23:02 2016 +0300

    Fix notification listeners usage
    
    Closes-Bug: #1570468
    
    Create the single notification pipeline listener and to aggregate
    targets and endpoints in it.
    
    In this implementation the incoming notification msg will be dispatched
    in a relevant endpoint by its own filter rule based on publisher id
    of a notifier, which sent this message.
    
    Each pipeline notifier has a conforming publisher id based on
    a pipeline name in which it to produce messages.
    
    Change-Id: If8c1c6838fd291ef8dbdd4d27c78fe5a36522178
    (cherry picked from commit 726b2d4d67ada3df07f36ecfd81b0cf72881e159)

commit de8272771eb8de7d2db44b8eee3cccef63622c0e
Author: OpenStack Proposal Bot <email address hidden>
Date:   Thu Apr 21 07:16:30 2016 +0000

    Imported Translations from Zanata
    
    For more information about this automatic import see:
    https://wiki.openstack.org/wiki/Translations/Infrastructure
    
    Change-Id: I7ce09e36757c6da5e3e37fb38f8a2cbb449ae9d2

commit c2b72462571b552f4055a8b887e6f974482e25a9
Author: OpenStack Proposal Bot <email address hidden>
Date:   Tue Apr 5 06:28:19 2016 +0000

    Imported Translations from Zanata
    
    For more information about this automatic import see:
    https://wiki.openstack.org/wiki/Translations/Infrastructure
    
    Change-Id: I292454c7a9e46ee4003c6754fe8dc873af810037

commit 1266e56da80dff8a6a5c7c572927679ee68a499c
Author: OpenStack Proposal Bot <email address hidden>
Date:   Thu Mar 31 06:36:04 2016 +0000

    Imported Translations from Zanata
    
    For more information about this automatic import see:
    https://wiki.openstack.org/wiki/Translations/Infrastructure
    
    Change-Id: I917d447a35c5d33e04fcf1bb37e62a6d6c73e6ea

commit 333104df791ca3932a6bef6a1be0c29f47d0bc01
Author: OpenStack Proposal Bot <email address hidden>
Date:   Wed Mar 30 06:27:12 2016 +0000

    Imported Translations from Zanata
    
    For more information about this automatic import see:
    https://wiki.openstack.org/wiki/Translations/Infrastructure
    
    Change-Id: Ifa2e9b27ef86f18b0d45fd6d49f1ccdc0ea6ba6c