Merge 902c6fb37f into 705c54edb6

2012-11-30 08:54:00 -08:00 · 2012-11-30 08:54:00 -08:00 · f7e44bd9ea
parent 705c54edb6 902c6fb37f
commit f7e44bd9ea
1 changed files with 1 additions and 1 deletions
--- a/utils/nova-novncproxy
+++ b/utils/nova-novncproxy
@ -64,7 +64,7 @@ opts = [
               default=6080,
               help='Port on which to listen for incoming requests'),
    ]
-CONF = config.CONF
+CONF = cfg.CONF
 CONF.register_cli_opts(opts)

 # As of nova commit 0b11668e64450039dc071a4a123abd02206f865f we must