diff options
| author | Soren Hansen <soren.hansen@rackspace.com> | 2010-07-27 11:10:19 +0200 |
|---|---|---|
| committer | Soren Hansen <soren.hansen@rackspace.com> | 2010-07-27 11:10:19 +0200 |
| commit | c4ffa57d4076b4aa5ed6262cdc2fece731b6875d (patch) | |
| tree | 83267302ef3792aa5f0273beff3e5257cda4bf7f /bin/nova-api | |
| parent | 9641dac5d0cbfd8d1f3026e1bae5749b9d8e00fc (diff) | |
| parent | fae70b1a769f52cc4730e04fcec8fe82cc8bd1c6 (diff) | |
| download | nova-c4ffa57d4076b4aa5ed6262cdc2fece731b6875d.tar.gz nova-c4ffa57d4076b4aa5ed6262cdc2fece731b6875d.tar.xz nova-c4ffa57d4076b4aa5ed6262cdc2fece731b6875d.zip | |
Merge with trunk.
Diffstat (limited to 'bin/nova-api')
| -rwxr-xr-x | bin/nova-api | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/nova-api b/bin/nova-api index 26f5dbc87..1f2009c30 100755 --- a/bin/nova-api +++ b/bin/nova-api @@ -29,7 +29,7 @@ from nova import flags from nova import rpc from nova import server from nova import utils -from nova.auth import users +from nova.auth import manager from nova.compute import model from nova.endpoint import admin from nova.endpoint import api |