Commit 18232af2 authored by Joel Martin's avatar Joel Martin

Merge branch 'master' of github.com:kanaka/noVNC

parents b50f3406 d5575ef6
...@@ -30,9 +30,9 @@ import wsproxy ...@@ -30,9 +30,9 @@ import wsproxy
from nova import context from nova import context
from nova import flags from nova import flags
from nova import rpc
from nova import utils from nova import utils
from nova.openstack.common import cfg from nova.openstack.common import cfg
from nova.openstack.common import rpc
opts = [ opts = [
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment