Ed Leafe 09188c61d5 Resolved trunk merge conflicts

2011-01-21 16:10:26 -05:00

..

__init__.py

Mongo bad, swift good.

2010-09-30 18:48:45 -04:00

bucket.py

Merge trunk.

2010-11-29 13:14:26 +01:00

handler.py

Resolved trunk merge conflicts

2011-01-21 16:10:26 -05:00

image.py

i18n's strings that were missed or have been added since initial i18n strings branch.

2011-01-20 12:52:02 -05:00

stored.py

PEP8 cleanup in nova/*, except for tests. There should be no functional changes here, just style changes to get violations down.

2010-10-21 17:15:21 -07:00