diff options
author | Jenkins <jenkins@review.openstack.org> | 2012-11-20 02:02:50 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2012-11-20 02:02:50 +0000 |
commit | 8c821c872cbec95bd48e68dc62c46030a097ce4f (patch) | |
tree | fe38ad882ef665d78f85dce46dda716a89971f08 /nova/test.py | |
parent | 1251c02d1d3587e7762eaab1352d08cbf5baa3c4 (diff) | |
parent | 94d87bce212f91c54370784a5544f1a07625938a (diff) | |
download | nova-8c821c872cbec95bd48e68dc62c46030a097ce4f.tar.gz nova-8c821c872cbec95bd48e68dc62c46030a097ce4f.tar.xz nova-8c821c872cbec95bd48e68dc62c46030a097ce4f.zip |
Merge "Remove nova.config.CONF"
Diffstat (limited to 'nova/test.py')
-rw-r--r-- | nova/test.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/test.py b/nova/test.py index 25572600f..3a52a2493 100644 --- a/nova/test.py +++ b/nova/test.py @@ -49,7 +49,7 @@ test_opts = [ help='should we use everything for testing'), ] -CONF = config.CONF +CONF = cfg.CONF CONF.register_opts(test_opts) LOG = logging.getLogger(__name__) |