diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-06-25 18:03:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-06-25 18:03:16 +0000 |
| commit | bf368360cb089a1db0b7a2bf6a7ba87c6f46a882 (patch) | |
| tree | c1401c5be44fcb3fa050baaeeb6f10f26c1a2e8d /bin | |
| parent | 2c7aa901b9174a4a4f04c5f8a52ef6c9d2d5d27c (diff) | |
| parent | 5685d20341502ddbb0265ebbaa6336f69aebc6fe (diff) | |
Merge "Fix import order of openstack.common"
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/nova-novncproxy | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/nova-novncproxy b/bin/nova-novncproxy index 228db0d2f..30a13612e 100755 --- a/bin/nova-novncproxy +++ b/bin/nova-novncproxy @@ -31,9 +31,9 @@ import websockify from nova import context from nova import flags from nova import log as logging +from nova.openstack.common import cfg from nova import rpc from nova import utils -from nova.openstack.common import cfg opts = [ |