summaryrefslogtreecommitdiffstats
path: root/bin/nova-api
diff options
context:
space:
mode:
authorVishvananda Ishaya <vishvananda@gmail.com>2010-07-27 13:08:22 -0700
committerVishvananda Ishaya <vishvananda@gmail.com>2010-07-27 13:08:22 -0700
commitfe4ba7d896347485347306b9702ebb5daa2afebf (patch)
tree8561513a5f0de3ad77f68141034995a477995711 /bin/nova-api
parent754db8ef1ceb84fa9a1f44bfc6c5c6bbd99cd7e1 (diff)
parenta5f4a865b537d95acf5f02458824f95d30aac261 (diff)
merged trunk
Diffstat (limited to 'bin/nova-api')
-rwxr-xr-xbin/nova-api2
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