Eric Day 60a5882c92 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

__init__.py

update copyrights

2010-07-15 01:28:51 -04:00

adminclient.py

merge trunk and upgrade to cheetah templating

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

exception.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

manager.py

updates per review

2010-12-14 16:05:39 -08:00

quota.py

Consolidated the start instance logic in the two API classes into a single method. This also cleans up a number of small discrepencies between the two.

2010-11-24 14:52:10 -08:00

rpc.py

merge trunk and upgrade to cheetah templating

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

service.py

merge trunk and upgrade to cheetah templating

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

test.py

First pass at converting run_tests.py to nosetests. The network and objctstore tests don't yet work. Also, we need to manually remove the sqlite file between runs.

2010-12-16 17:05:54 -08:00

twistd.py

merge trunk and upgrade to cheetah templating

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

utils.py

merge trunk and upgrade to cheetah templating

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

wsgi.py

Make time.sleep() non-blocking

2010-11-22 16:28:28 -06:00