Merge pull request #216 from komawar/config-module

Changed the config module which includes CONF
This commit is contained in:
Joel Martin
2012-11-30 11:58:50 -08:00

View File

@@ -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