diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-05-08 01:38:12 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-05-08 01:38:12 +0000 |
| commit | 650fe9c217ccf5739636d70850a847f331ab4da3 (patch) | |
| tree | 4ae1a34ddae9feaf55201e78b6f252681d32805e | |
| parent | f310db78442ba895ab74e731193b502447afe615 (diff) | |
| parent | 9a9a28e80ae043bdf7476651ea8d92aedf0ba36c (diff) | |
| download | nova-650fe9c217ccf5739636d70850a847f331ab4da3.tar.gz nova-650fe9c217ccf5739636d70850a847f331ab4da3.tar.xz nova-650fe9c217ccf5739636d70850a847f331ab4da3.zip | |
Merge "Fix a race with rpc.register_opts in service.py."
| -rw-r--r-- | nova/service.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/nova/service.py b/nova/service.py index d4c9cf683..7d5db5a0a 100644 --- a/nova/service.py +++ b/nova/service.py @@ -434,6 +434,7 @@ def serve(*servers): def wait(): LOG.debug(_('Full set of FLAGS:')) + rpc.register_opts(FLAGS) for flag in FLAGS: flag_get = FLAGS.get(flag, None) # hide flag contents from log if contains a password |