cleanup openstack-common.conf and sync updated files

periodic updates of latest from oslo-incubator. please
note that files no longer on oslo-incubator mean that
they have been moved to oslo.* libraries. So there's
more work needed to remove these files and switch
to appropriate libraries

Change-Id: Icd71b4b1ea9f1df526614a29277f25a7ab47b721
This commit is contained in:
Davanum Srinivas
2015-06-07 10:11:48 -04:00
committed by Davanum Srinivas (dims)
parent dfa98ab04c
commit 5e85d61fb9
4 changed files with 4 additions and 5 deletions
@@ -465,7 +465,7 @@ def from_response(response, method, url):
kwargs["details"] = (error.get("details") or
six.text_type(body))
elif content_type.startswith("text/"):
kwargs["details"] = response.text
kwargs["details"] = getattr(response, 'text', '')
try:
cls = _code_map[response.status_code]