Merge branch '1.5' into 2.0

This commit is contained in:
Julien Duponchelle
2016-05-18 11:25:41 +02:00
22 changed files with 65 additions and 53 deletions

View File

@ -70,7 +70,7 @@ class BaseNode:
else:
self._console = self._manager.port_manager.reserve_tcp_port(self._console, self._project)
# We need to allocate aux before giving a random console port
# We need to allocate aux before giving a random console port
if self._aux is not None:
self._aux = self._manager.port_manager.reserve_tcp_port(self._aux, self._project)