Merge branch '2.0' into 2.1

This commit is contained in:
Julien Duponchelle committed 2017-05-16 08:38:13 +02:00
commit bef1b2e8f1
2 files changed
+6 -1

No files matched your search

+1 -1
View File
@@ -529,7 +529,7 @@ class Compute:
raise aiohttp.web.HTTPForbidden(text=msg)
elif response.status == 404:
raise aiohttp.web.HTTPNotFound(text="{} {} not found".format(method, path))
elif response.status == 408:
elif response.status == 408 or response.status == 504:
raise aiohttp.web.HTTPRequestTimeout(text="{} {} request timeout".format(method, path))
elif response.status == 409:
try: