Merge pull request #216 from komawar/config-module

Changed the config module which includes CONF

Merge pull request #216 from komawar/config-module
Changed the config module which includes CONF
d55f5377 · Joel Martin · 705c54ed · 902c6fb3 · d55f5377
Commit d55f5377 authored Nov 30, 2012 by Joel Martin
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

nova-novncproxy utils/nova-novncproxy +1 -1

No files found.
--- 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