Updated openstack/openstack
Project: openstack/tempest  3e0bea640628d7967d2da1038c5749c623e98edc
null
Fix display_name of volume for test_volumes_list

In test_volumes_list, three volumes are created for some tests.
These display_name seems wrong like "volume-%s1393726625json".
The interface name should be inserted after "volume-", but it is
appended to the tail.
This patch fixes this volume name.

Change-Id: Iee55d2405e888569455a2325fe6b2843ddf9de9d
Updated openstack/openstack
Project: openstack/ceilometer  d1601a767f86847cf39d83928b301773515b653d
null
Add configuration-driven conversion to Events

Add configuration to control what traits get added to Events
from notifications, how those traits are defined, and what
notifications get converted (and eventually stored).

Change-Id: I2befc97b3d3b33851a5bfe709bf086895fd72cce
Implements: blueprint configurable-event-definitions