Kei Masumoto b408ab54f5 fix conflict

2011-07-11 14:58:57 +09:00

..

auth

merged trunk, fixed the floating_ip fixed_ip exception stupidity

2011-06-29 12:58:10 -05:00

notifier

remerged trunk

2011-06-28 10:23:00 +00:00

scheduler

trunk merge with migration renumbering

2011-06-30 14:20:59 -05:00

tests

fix conflict

2011-07-11 14:58:57 +09:00

fakememcache.py

docstring cleanup, nova dir

2011-04-20 12:08:22 -07:00

fakerabbit.py

cleanup the code for merging

2011-05-25 15:42:49 -07:00

flags.py

merging trunk

2011-06-17 13:12:13 -04:00

log.py

Further nova-api cleanup.

2011-06-19 16:27:46 -04:00

rpc.py

Reverses the self.auto_delete = True that was added to TopicPublisher

2011-06-30 17:52:04 -07:00

twistd.py

Use super on an old style class

2011-06-06 11:20:25 -04:00