diff options
| author | Vishvananda Ishaya <vishvananda@gmail.com> | 2010-07-18 13:25:43 -0500 |
|---|---|---|
| committer | Vishvananda Ishaya <vishvananda@gmail.com> | 2010-07-18 13:25:43 -0500 |
| commit | 5d647826d6345bfdd87bad10995319679f39679f (patch) | |
| tree | 979b3fa11717c38b868b08239cbf3a50b4e27f49 /bin/nova-api | |
| parent | 0b396e1315a76112ab978a677e96d7b3a371faa9 (diff) | |
| parent | b09e69c5579526fcc1a08c7e3c3a3c880fa09297 (diff) | |
merged in trunk and fixed import merge errors
Diffstat (limited to 'bin/nova-api')
| -rwxr-xr-x | bin/nova-api | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/bin/nova-api b/bin/nova-api index 7bc9166b8..26f5dbc87 100755 --- a/bin/nova-api +++ b/bin/nova-api @@ -22,8 +22,6 @@ Tornado daemon for the main API endpoint. """ import logging - -from nova import vendor from tornado import httpserver from tornado import ioloop |