Eric Day 5324961f55 Merged trunk and resolved conflicts.

2010-12-23 10:31:46 -08:00

..

nova-api

merged from upstream

2010-12-15 11:02:33 -08:00

nova-combined

first merge after i18n

2010-12-23 02:09:50 +00:00

nova-compute

merged from upstream

2010-12-15 11:02:33 -08:00

nova-dhcpbridge

Fixed network test (thanks Vish!) and fixed run_tests.sh.

2010-12-16 17:29:26 -08:00

nova-import-canonical-imagestore

For some reason, I forgot to commit the other endpoints...

2010-12-14 18:22:03 -05:00

nova-instancemonitor

For some reason, I forgot to commit the other endpoints...

2010-12-14 18:22:03 -05:00

nova-manage

merged trunk, fixed conflicts and tests

2010-12-16 22:52:08 +00:00

nova-network

merged from upstream

2010-12-15 11:02:33 -08:00

nova-objectstore

For some reason, I forgot to commit the other endpoints...

2010-12-14 18:22:03 -05:00

nova-scheduler

merged from upstream

2010-12-15 11:02:33 -08:00

nova-volume

merged from upstream

2010-12-15 11:02:33 -08:00