Merge "Use CONF for oslo_config's cfg.CONF again"

This commit is contained in:
Jenkins
2017-03-16 08:13:03 +00:00
committed by Gerrit Code Review
2 changed files with 2 additions and 2 deletions

View File

@@ -674,7 +674,7 @@ def timeline(records, **kwargs):
@app.template_test()
def too_old(timestamp):
age = cfg.CONF.age_warn
age = CONF.age_warn
now = time.time()
return timestamp + age < now

View File

@@ -125,7 +125,7 @@ def _session_request(session, uri, method):
headers = {'User-Agent': user_agent, 'Accept': 'application/json'}
return session.request(method, uri, headers=headers,
timeout=cfg.CONF.read_timeout)
timeout=CONF.read_timeout)
def do_request(uri, method='get', session=None):