Anthony Young 7cfca52087 merge trunk, fix conflict

2011-01-11 17:32:12 -08:00

..

nova-ajax-console-proxy

consolidate boto_extensions.py and euca-get-ajax-console, fix bugs

2011-01-10 13:44:45 -08:00

nova-api

merged from upstream

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

nova-api-paste

Merge trunk.

2011-01-07 09:46:17 -05:00

nova-combined

whups, fix accidental change to nova-combined

2011-01-10 15:00:30 -06:00

nova-compute

merged from upstream

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

nova-console

add in xs-console worker and tests.

2011-01-05 14:16:14 -06:00

nova-dhcpbridge

Final few log tweaks, i18n, levels, including contexts, etc.

2011-01-04 00:26:41 -05: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

Final few log tweaks, i18n, levels, including contexts, etc.

2011-01-04 00:26:41 -05:00

nova-logspool

pep8 fixes

2011-01-07 14:09:38 -05:00

nova-manage

Typo fix

2011-01-10 15:13:30 +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-spoolsentry

Apply logging changes as a giant patch to work around the cloudpipe delete + add issue in the original patch.

2011-01-04 00:23:35 -05:00

nova-volume

merged from upstream

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