Todd Willey 14d5fd40e5 Merge branch 'master' into apply_api ...

Conflicts:
	nova/compute/network.py
	nova/utils.py

2010-07-14 23:42:55 -04:00

..

dhcpleasor.py

whitespace fixes and header changes

2010-07-07 12:25:22 -07:00

nova-api

Finish singletonizing UserManager usage.

2010-07-14 19:51:38 -04:00

nova-compute

unhardcode the binary name

2010-07-14 19:57:41 -04:00

nova-instancemonitor

Removed trailing whitespace from header

2010-06-29 21:25:59 -05:00

nova-manage

Fix merge changelog and merge errors in utils.py

2010-07-14 14:39:51 -05:00

nova-objectstore

Removed trailing whitespace from header

2010-06-29 21:25:59 -05:00

nova-volume

Removed trailing whitespace from header

2010-06-29 21:25:59 -05:00