Merge branch '2.1' into 2.2

# Conflicts:
#	gns3server/version.py
#	requirements.txt

gns3server/controller/compute.py

@@ -337,12 +337,13 @@ class Compute:
         return response
 
     @asyncio.coroutine
-    def stream_file(self, project, path):
+    def stream_file(self, project, path, timeout=None):
         """
         Read file of a project and stream it
 
         :param project: A project object
         :param path: The path of the file in the project
+        :param timeout: timeout
         :returns: A file stream
         """
 
@@ -361,7 +362,7 @@ class Compute:
                 self._response.close()
 
         url = self._getUrl("/projects/{}/stream/{}".format(project.id, path))
-        response = yield from self._session().request("GET", url, auth=self._auth, timeout=None)
+        response = yield from self._session().request("GET", url, auth=self._auth, timeout=timeout)
         if response.status == 404:
             raise aiohttp.web.HTTPNotFound(text="{} not found on compute".format(path))
         elif response.status == 403:
@@ -527,8 +528,8 @@ class Compute:
                 headers=headers
             ))
             response = yield from self._session().request(method, url, headers=headers, data=data, auth=self._auth, chunked=chunked, timeout=timeout)
-        except asyncio.TimeoutError as e:
-            raise ComputeError("Timeout error when connecting to {}".format(url))
+        except asyncio.TimeoutError:
+            raise ComputeError("Timeout error for {} call to {} after {}s".format(method, url, timeout))
         except (aiohttp.ClientError, aiohttp.ServerDisconnectedError, ValueError, KeyError, socket.gaierror) as e:
             #  aiohttp 2.3.1 raises socket.gaierror when cannot find host
             raise ComputeError(str(e))
@@ -641,7 +642,7 @@ class Compute:
         List files in the project on computes
         """
         path = "/projects/{}/files".format(project.id)
-        res = yield from self.http_query("GET", path, timeout=120)
+        res = yield from self.http_query("GET", path, timeout=None)
         return res.json
 
     @asyncio.coroutine