Merge 90f18a8a96 into bee36506e1

2012-06-21 18:40:14 -07:00 · 2012-06-21 18:40:14 -07:00 · 6532e0f400
parent bee36506e1 90f18a8a96
commit 6532e0f400
1 changed files with 1 additions and 1 deletions
--- a/utils/nova-novncproxy
+++ b/utils/nova-novncproxy
@ -30,9 +30,9 @@ import wsproxy

 from nova import context
 from nova import flags
-from nova import rpc
 from nova import utils
 from nova.openstack.common import cfg
+from nova.openstack.common import rpc


 opts = [