summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-07-13 17:57:28 +0000
committerGerrit Code Review <review@openstack.org>2012-07-13 17:57:28 +0000
commit6cfd3abcaba29e493ce794c54b769c1aa2d2b336 (patch)
tree7e439fc6bfe015524c8391fbcbfd91fce41eb3ee
parent7369bb9ba8d5710ea20c8bfb7b2465b9906fa0bc (diff)
parentc6c29ab3898a88144f022aaefd1e8267e4dbb866 (diff)
downloadnova-6cfd3abcaba29e493ce794c54b769c1aa2d2b336.tar.gz
nova-6cfd3abcaba29e493ce794c54b769c1aa2d2b336.tar.xz
nova-6cfd3abcaba29e493ce794c54b769c1aa2d2b336.zip
Merge "Sync cfg from openstack-common."
-rw-r--r--nova/openstack/common/cfg.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/openstack/common/cfg.py b/nova/openstack/common/cfg.py
index 6d71b0304..64411180f 100644
--- a/nova/openstack/common/cfg.py
+++ b/nova/openstack/common/cfg.py
@@ -42,8 +42,8 @@ Options can be strings, integers, floats, booleans, lists or 'multi strings'::
osapi_compute_extension_opt = cfg.MultiStrOpt('osapi_compute_extension',
default=DEFAULT_EXTENSIONS)
-Option schemas are registered with with the config manager at runtime, but
-before the option is referenced::
+Option schemas are registered with the config manager at runtime, but before
+the option is referenced::
class ExtensionManager(object):