Joshua Harlow a849d7b257 Merge branch 'new/persona' of git://github.com/harlowja/Openstack-DevstackPy into harlowja-new/persona ...

Conflicts:
	devstack/cfg_helpers.py
	devstack/components/db.py
	devstack/components/keystone.py
	devstack/components/nova.py

2012-03-16 10:59:33 -07:00

12 KiB

Raw Blame History

View Raw