Pull most recent API changes in

[aadams19]

Signed-off-by: Andrea Adams [email protected]

[craigbr]

Tried this in my docker-compose environment, monasca alarm-list failed with:
HTTPException code=500 message={"description":"(pymysql.err.InternalError) (1054, u"Unknown column 'a.inhibited' in 'field list'") [SQL: u"SELECT DISTINCT a.id AS alarm_id, a.state, a.state_updated_at AS state_updated_timestamp, a.updated_at AS updated_timestamp, a.created_at AS created_timestamp, a.lifecycle_state, a.link, a.inhibited, a.silenced, ad.id AS alarm_definition_id, ad.name AS alarm_definition_name, ad.severity, mde.name AS metric_name, mdg.dimensions AS metric_dimensions \nFROM alarm AS a INNER JOIN alarm_definition AS ad ON ad.id = a.alarm_definition_id INNER JOIN alarm_metric AS am ON am.alarm_id = a.id INNER JOIN metric_definition_dimensions AS mdd ON mdd.id = am.metric_definition_dimensions_id INNER JOIN metric_definition AS mde ON mde.id = mdd.metric_definition_id LEFT OUTER JOIN (SELECT md.dimension_set_id AS dimension_set_id, GROUP_CONCAT(concat(concat(md.name, '='), md.value) SEPARATOR ',') AS dimensions \nFROM metric_dimension AS md GROUP BY md.dimension_set_id) AS mdg ON mdg.dimension_set_id = mdd.metric_dimension_set_id INNER JOIN (SELECT a.id AS id \nFROM alarm AS a INNER JOIN alarm_definition AS ad ON a.alarm_definition_id = ad.id \nWHERE ad.tenant_id = %(b_tenant_id)s AND ad.id = %(b_alarm_definition_id)s ORDER BY a.id \n LIMIT %(b_limit)s) AS alarm_id_list ON alarm_id_list.id = a.id ORDER BY a.id"] [parameters: {'b_tenant_id': u'0d37919ea42442b8b4a7079c1cccef61', 'b_alarm_definition_id': '625df95e-e47b-476e-9260-9f5993b6297d', 'b_limit': 10001}] (Background on this error at: http://sqlalche.me/e/2j85)","title":"Service unavailable"}

[aadams19]

Oh no! That's from before https://review.openstack.org/#/c/533007/ . Let me look into why you would be seeing that

[craigbr]

Never mind, I didn't actually use the right version on the build.