Vishvananda Ishaya 56e601cb75 Merge of DHCP changes including dnsmasq callbacks ...

Conflicts:
	nova/utils.py

2010-07-14 16:27:18 -05:00

..

dhcpleasor.py

whitespace fixes and header changes

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

nova-api

Removed trailing whitespace from header

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

nova-compute

Removed trailing whitespace from header

2010-06-29 21:25:59 -05: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