Eric Day e0b8676fe0 Merged trunk and resolved conflicts.

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

..

auth

Merge from trunk, and resolve conflict with nova/auth/ldapdriver.py

2010-12-22 23:47:31 +00:00

scheduler

merge trunk and upgrade to cheetah templating

2010-12-22 20:59:53 +00:00

tests

Merged trunk and resolved conflicts.

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

adminclient.py

merge trunk and upgrade to cheetah templating

2010-12-22 20:59:53 +00:00

fakememcache.py

clean up tests and add overriden time method to utils

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

fakerabbit.py

pep8 fix

2010-12-22 21:55:11 +00:00

flags.py

merge trunk and upgrade to cheetah templating

2010-12-22 20:59:53 +00:00

rpc.py

merge trunk and upgrade to cheetah templating

2010-12-22 20:59:53 +00:00

twistd.py

merge trunk and upgrade to cheetah templating

2010-12-22 20:59:53 +00:00