Skip to content

N
noVNC
Commit cededc4d authored by Joel Martin's avatar Joel Martin
Browse files
Options

Merge pull request #244 from djipko/common_conf_to_oslo_conf 

Import cfg from oslo in nova-novncproxy
parents 60d99177 de0f8773
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
utils/nova-novncproxy
View file @ cededc4d
...@@ -23,6 +23,7 @@ Leverages wsproxy.py by Joel Martin ...@@ -23,6 +23,7 @@ Leverages wsproxy.py by Joel Martin
''' '''
import Cookie import Cookie
from oslo.config import cfg
import socket import socket
import sys import sys
...@@ -31,7 +32,6 @@ import wsproxy ...@@ -31,7 +32,6 @@ import wsproxy
from nova import config from nova import config
from nova import context from nova import context
from nova import utils from nova import utils
from nova.openstack.common import cfg
from nova.openstack.common import rpc from nova.openstack.common import rpc
......
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