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 /nova/adminclient.py | |
| parent | 0b396e1315a76112ab978a677e96d7b3a371faa9 (diff) | |
| parent | b09e69c5579526fcc1a08c7e3c3a3c880fa09297 (diff) | |
merged in trunk and fixed import merge errors
Diffstat (limited to 'nova/adminclient.py')
| -rw-r--r-- | nova/adminclient.py | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/nova/adminclient.py b/nova/adminclient.py index 1a5f41418..db392feb1 100644 --- a/nova/adminclient.py +++ b/nova/adminclient.py @@ -20,8 +20,6 @@ Nova User API client library. """ import base64 - -from nova import vendor import boto from boto.ec2.regioninfo import RegionInfo |