diff options
| author | Michael Gundlach <michael.gundlach@rackspace.com> | 2010-08-23 16:43:25 -0400 |
|---|---|---|
| committer | Michael Gundlach <michael.gundlach@rackspace.com> | 2010-08-23 16:43:25 -0400 |
| commit | 41e2e91ccfb1409f1ea47d92a9d15f47ab37e65d (patch) | |
| tree | 62edd01a7f1b95dee621b6129aa8fdcbf8a34c9e | |
| parent | 35a08780c41ece1b47b2ded98c061b103a400fea (diff) | |
| download | nova-41e2e91ccfb1409f1ea47d92a9d15f47ab37e65d.tar.gz nova-41e2e91ccfb1409f1ea47d92a9d15f47ab37e65d.tar.xz nova-41e2e91ccfb1409f1ea47d92a9d15f47ab37e65d.zip | |
Merge fail
| -rw-r--r-- | nova/api/rackspace/base.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/api/rackspace/base.py b/nova/api/rackspace/base.py index 51841925e..dd2c6543c 100644 --- a/nova/api/rackspace/base.py +++ b/nova/api/rackspace/base.py @@ -27,4 +27,4 @@ class Controller(wsgi.Controller): if isinstance(instance, list): return {cls.entity_name: cls.render(instance)} else: - return { "TODO": "TODO" } + return {"TODO": "TODO"} |