Christian Berendt d5cd184aa2 merged with trunk and removed conflicts

2011-03-15 08:45:35 +01:00

..

nova-ajax-console-proxy

fixed: bin/nova-ajax-console-proxy:66:19: W601 .has_key() is deprecated, use 'in'

2011-02-25 22:15:51 +01:00

nova-api

Sorted imports correctly

2011-03-08 16:45:20 -08:00

nova-compute

fix pep8 and remove extra reference to reset

2011-02-21 13:59:46 -08:00

nova-console

switch to explicit call to logging.setup()

2011-02-21 13:46:41 -08:00

nova-dhcpbridge

Make "dhcpbridge init" output correctly formatted leases information.

2011-03-07 15:12:26 +01:00

nova-direct-api

add help back to the scripts that don't use service.py

2011-02-23 15:26:52 -08:00

nova-import-canonical-imagestore

switch to explicit call to logging.setup()

2011-02-21 13:46:41 -08:00

nova-instancemonitor

switch to explicit call to logging.setup()

2011-02-21 13:46:41 -08:00

nova-logspool

pep8 fixes

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

nova-manage

merged with trunk and removed conflicts

2011-03-15 08:45:35 +01:00

nova-network

switch to explicit call to logging.setup()

2011-02-21 13:46:41 -08:00

nova-objectstore

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

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

nova-scheduler

switch to explicit call to logging.setup()

2011-02-21 13:46:41 -08:00

nova-spoolsentry

corrected nesting of the data dictionary

2011-01-24 18:39:47 -08:00

nova-volume

switch to explicit call to logging.setup()

2011-02-21 13:46:41 -08:00

stack

Removes circular import issues from bin/stack and replaces utils.loads with json.loads. Fixes Bug#704424

2011-01-18 10:24:20 -05:00