summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-09-06 19:55:52 +0000
committerGerrit Code Review <review@openstack.org>2012-09-06 19:55:52 +0000
commit20ae7ee86ac32005012592936b763b812340cebd (patch)
tree9ad34300771bd86907ab089f9b6daef50d358eda
parentc29f6d27a8de2e475b06ba3123f65b658eff72e5 (diff)
parent76068c27d964bde71870e15c286a97971a85b347 (diff)
Merge "Add missing argument to novncproxy websockify call"
-rwxr-xr-xbin/nova-novncproxy1
1 files changed, 1 insertions, 0 deletions
diff --git a/bin/nova-novncproxy b/bin/nova-novncproxy
index c4eb7a8be..3abaaa769 100755
--- a/bin/nova-novncproxy
+++ b/bin/nova-novncproxy
@@ -73,6 +73,7 @@ LOG = logging.getLogger(__name__)
class NovaWebSocketProxy(websockify.WebSocketProxy):
def __init__(self, *args, **kwargs):
websockify.WebSocketProxy.__init__(self, unix_target=None,
+ target_cfg=None,
ssl_target=None, *args, **kwargs)
def new_client(self):