Updated openstack/openstack
Project: openstack/ceilometer  f983ff6105841122cf33c67a7e8543979184ed7c

Fixes Hyper-V metrics units

Changes the units of the values returned for the network and disks data to
bytes as expected.

Closes-Bug: #1289015
(cherry picked from commit f55e3510bbee39d3101fcbf2283fc037c7a42c99)

Change-Id: If4950d05213a345900b3450c83450345e04560fc
Updated openstack/openstack
Project: openstack/ceilometer  3c15ae4ba0d019a3e50a087f448a8cf8ca978a68

Disable specifying alarm itself in combination rule

Currently, update combination alarm can specify itself in alarm_ids,
however, that will cause endless loop when evaluating this alarm.

This patch adds a check to disable such behavior.

Change-Id: I63b465c59fe39206ae04b0736482d1ffd7bf59c4
Closes-Bug: #1304419
(cherry picked from commit de8176fa736ffa9c4d6b0a57a8db2f58083f124a)