openstack/aodh
Code Issues Proposed changes

Merge "Sync config generator workaround from oslo"

Browse Source
This commit is contained in:
Jenkins 2014-01-08 00:57:15 +00:00 committed by Gerrit Code Review
commit 4cec86eae2
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ceilometer/openstack/common/config/generator.py
View File

@ -121,7 +121,9 @@ def _import_module(mod_str):
def _is_in_group(opt, group): def _is_in_group(opt, group):
"Check if opt is in group." "Check if opt is in group."
for key, value in group._opts.items(): for key, value in group._opts.items():
if value['opt'] == opt: # NOTE(llu): Temporary workaround for bug #1262148, wait until
# newly released oslo.config support '==' operator.
if not(value['opt'] != opt):
return True return True
return False return False

2
ceilometer/openstack/common/gettextutils.py
View File

@ -19,7 +19,7 @@ gettext for openstack-common modules.
Usual usage in an openstack.common module: Usual usage in an openstack.common module:
from ceilometer.openstack.common.gettextutils import _ from ceilometer.openstack.common.gettextutils import _ # noqa
""" """
import copy import copy