Eldar Nugaev 4695b46d6b merge with trunk and resolve conflicts

2011-04-27 00:51:51 -07:00

..

api

merging trunk

2011-04-26 15:48:28 -07:00

auth

merging trunk

2011-04-26 15:48:28 -07:00

CA

make geninter.sh use the right tmpl file

2011-04-19 10:20:56 -07:00

cloudpipe

actually use the ec2_id

2011-04-19 09:32:33 -07:00

compute

merging trunk

2011-04-22 15:44:24 -04:00

console

merging trunk

2011-04-22 15:44:24 -04:00

db

pep8

2011-04-22 15:49:37 -04:00

image

merging trunk

2011-04-22 15:44:24 -04:00

network

merging trunk

2011-04-22 15:44:24 -04:00

objectstore

add descriptive docstring

2011-03-24 16:38:31 -07:00

scheduler

correcting tests; pep8

2011-04-15 14:24:17 -04:00

tests

merge with trunk and resolve conflicts

2011-04-27 00:51:51 -07:00

virt

merge with trunk and resolve conflicts

2011-04-27 00:51:51 -07:00

vnc

fix localization for multiple replacement strings

2011-03-29 22:41:15 -07:00

volume

Merge trunk.

2011-04-22 09:57:19 +09:00

__init__.py

more smoketest fixes

2011-01-20 00:14:42 -08:00

context.py

docstring cleanup, nova dir

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

crypto.py

docstring cleanup, nova dir

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

exception.py

merging trunk

2011-04-26 15:48:28 -07:00

fakememcache.py

docstring cleanup, nova dir

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

fakerabbit.py

We're not using prefix matching on AMQP, so fakerabbit shouldn't be doing it!

2011-02-22 15:05:48 -08:00

flags.py

merged trunk

2011-04-21 16:01:38 -07:00

log.py

docstring cleanup, nova dir

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

manager.py

docstring cleanup, nova dir

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

quota.py

docstring cleanup, nova dir

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

rpc.py

docstring cleanup, nova dir

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

service.py

docstring cleanup, nova dir

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

test.py

docstring cleanup, nova dir

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

twistd.py

switch to explicit call to logging.setup()

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

utils.py

merging trunk

2011-04-22 15:44:24 -04:00

version.py

docstring cleanup, nova dir

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

wsgi.py

merge with trunk

2011-04-22 03:25:07 +04:00