Merge branch 'stable/essex' of github.com:melwitt/Openstack-Anvil into stable/essex

Browse Source

Conflicts:
	anvil/components/keystone.py
	conf/anvil.ini
	tools/upload-img-noanvil.py

...

This commit is contained in:

melwitt 2012-10-10 00:41:50 +00:00

parent bb6be08238 652bcc7809

commit 53d639476d

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available