Rick Harris 0a11cb3bea Fixing conflicts

2011-06-02 14:08:19 -05:00

..

auth

don't use python if readlink is available

2011-06-02 10:20:26 -07:00

notifier

Spacing changes

2011-05-18 12:55:17 -05:00

scheduler

Fixing conflicts

2011-06-02 14:08:19 -05:00

tests

Fixing conflicts

2011-06-02 14:08:19 -05: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

Allow SSL AMQP connections.

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

log.py

pep8 fixes

2011-06-01 10:17:00 -04:00

rpc.py

Allow SSL AMQP connections.

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

twistd.py

switch to explicit call to logging.setup()

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