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

commit 9899b6f12f5072787ac72a1a64d4a712db222cb3
Author: Samta <email address hidden>
Date:   Wed Oct 8 16:27:12 2014 +0530

    Fix recording failure for system pollster
    
    The parameter "cumulative" was interpreted as a list and could
    not be recognized as a valid Type for SQL query hence failing
    to record the data for the pollster.
    
    The presence of ',' operator in the pollster class after the term
    CUMULATIVE caused it to be treated as a list
    
    This is corrected to interpret the field as a string which will
    be successfully recorded to the meter database.
    
    Change-Id: I10a69134a7f0c42a3e6c0d9bb7568e8d8fd2a932
    Closes-Bug: 1378742
    (cherry picked from commit f8f63d4b15ce68797d6e16943bd85efb19a77752)

commit 619291bd6c5d9775aaa9fcc2b47e8120e6f3443d
Author: Julien Danjou <email address hidden>
Date:   Fri Oct 10 16:25:58 2014 +0200

    Add oslo.db to config generator
    
    Otherwise we miss the oslo.db configuration option in the sample config
    file.
    
    Closes-Bug: 1379808
    
    Change-Id: I3a70e5da42562081002286d37ba1a200150c8cfc
    (cherry picked from commit f7392e47575c8baa081406b03cf14ce2894a5996)

commit 5b966ba778ad9e87a41fc639a64e68f84d6ca8e2
Author: Eoghan Glynn <email address hidden>
Date:   Tue Oct 7 16:25:34 2014 +0000

    Manually updated translations
    
    The workflow boils down to:
    
     $ sudo easy_install Babel
     $ sudo yum install gettext
     $ python setup.py extract_messages
     $ python setup.py update_catalog --no-fuzzy-matching \
       --ignore-obsolete=true
     $ source \
       ../project-config/jenkins/scripts/common_translation_update.sh
     $ setup_loglevel_vars
     $ cleanup_po_files ceilometer
    
    Change-Id: Ia16b2b15004e0e0cbd4332ed5106ba04f1736ade

commit aa15b2d7ed02822b72f878e889b3a77c97b4a6c5
Author: Pradeep Kilambi <email address hidden>
Date:   Tue Sep 30 11:24:20 2014 -0700

    Fix neutron client to catch 404 exceptions
    
    When network services such as lbaas, fwaas or vpnaas are disabled
    in neutron, the discovery continues to poll the api calls and gets
    back a not found exception. The fix here is to catch the exception
    so it doesn't go unhandled.
    
    Change-Id: I8f350b9009f0d8c172836b1dd1123e966f887fdb
    Closes-Bug: #1374012
    (cherry picked from commit b65554eb460a282a2ab0a2dcc0053a8691cb9373)

commit fc22a04cfbab9a868347bea78a0b55c2b3316ef1
Author: Thomas Bechtold <email address hidden>
Date:   Mon Sep 29 10:53:50 2014 +0200

    Fix OrderedDict usage for Python 2.6
    
    "import collections" also works on Python 2.6 but
    collections.OrderedDict() is not available so the current check is
    wrong. Using a function to get an OrderedDict() instance works fine for
    that.
    
    Closes-Bug: #1375568
    Change-Id: Iaf739dc2deb7d4b09bf477be60de4df8c4fcf5c0
    (cherry picked from commit 7212f7dc92c1c6fd5d7e36fc270b74efec412d72)

commit cac21417118c9aa72705088f8d04ff5250d93123
Author: Chris Dent <email address hidden>
Date:   Mon Oct 6 20:00:08 2014 +0100

    Include a 'node' key and value in ipmi metadata
    
    The ipmi meters use resource_ids which make it challenging
    to select information for all the sensors of a particular type.
    This change adds metadata that identifies the physical node on
    which a sensor exists.
    
    There are still remaining issues with the naming of ipmi and
    sensor-related meters that will need to be addressed separately.
    
    Closes-Bug: 1377157
    Change-Id: Ib53755112e4757aa53ab60079f3c555e21a72b63
    (cherry picked from commit 3b20fa08527170aaca38253277feedf0f2d11217)

commit e6078929fd3235eab7f2b5f136a5c9df347bf94c
Author: gordon chung <email address hidden>
Date:   Mon Sep 29 18:39:03 2014 -0400

    clean path in swift middleware
    
    the path also requires encoding as syslogs still show errors.
    
    Closes-Bug: #1369124
    Change-Id: Ie4d19a5a7dd5ce29e10c6e082bfcb33e6e641623
    (cherry picked from commit dbe8c8b20f4231841d2086fbfd278f3a4cde8324)

commit 0e499f88d1f197aba59107237302009afcc2b500
Author: OpenStack Proposal Bot <email address hidden>
Date:   Mon Oct 6 16:08:39 2014 +0000

    Updated from global requirements
    
    Change-Id: I4a0be4a03e6c3590a7cab8f4548a128fdc31d1ca