Updated openstack/openstack
Project: openstack/glance  0a5064dc1e62a5961443b2a671e4265bf9c0aefc
null
Add tests for glance/notifier/notify_kombu

Add tests for glance/notifier/notify_kombu in
RabbitStrategyTestCase class.
Tests for:
- _close()
- _connect()
- time.sleep() in reconnect()
- processing KombuMaxRetriesReached error in _notify()

Change-Id: I39805ce460ce2b71dcb05e63cb898c5569d726b0
Updated openstack/openstack
Project: openstack/nova  da633d09b6553edd15f2e0c134a14577b0137de8
null
Fix up spelling mistake

Fixes bug 1253510

This was causing a KeyError when e2label didn't work

Change-Id: I0646409cdffa4d6d5d8b2c7a9e3c300022d1c9b8