Updated openstack/openstack
Project: openstack/keystone  fd0297e2150ce4db3024a663f9183ed6cef99d5a
null
Use six.text_type to replace unicode

unicode only exists in Python 2. Use six.text_type to make code
Python 3 comaptible. See http://pythonhosted.org/six/#six.text_type

Part of blueprint keystone-py3kcompat

Change-Id: I044036708b1fc6190647abce699e6898b274d487
Updated openstack/openstack
Project: openstack/heat  53af16013b874816ec4b4788e0a17df82ab2cce9
null
Marconi message queue resource implementation

This implements a Marconi backed native OpenStack message queue. Customers
can create a OS::Marconi::Queue queue resource declaratively in templates
and pass the href/endpoint of the queue to other resources by means of href
attribute of the queue.

Marconi bp,
https://blueprints.launchpad.net/marconi/+spec/heat-template

Implements: blueprint mqaas-marconi-resource

Change-Id: Icbbb1869b352dbdba22530f9ec185652f4da75b6