diff options
| author | Richard Ipsum <richard.ipsum@codethink.co.uk> | 2014-06-11 16:48:01 +0100 |
|---|---|---|
| committer | Richard Ipsum <richard.ipsum@codethink.co.uk> | 2014-06-11 16:48:01 +0100 |
| commit | 2ca28887442c733f2f7a39aa7a844b51643ecb29 (patch) | |
| tree | a883ff57d8ab08656133e7a77c4760e6c15162cc /distbuild/__init__.py | |
| parent | 13edeabd929b094ab2ec7288840e62d31d9feb67 (diff) | |
| parent | 58e738ceb4b35031793a35e8affc929c7d82f76b (diff) | |
| download | morph-2ca28887442c733f2f7a39aa7a844b51643ecb29.tar.gz | |
Merge branch 'baserock/richardipsum/distbuild_err_when_no_controller2'
Reviewed by:
Lars Wirzenius
Richard Maw
Diffstat (limited to 'distbuild/__init__.py')
| -rw-r--r-- | distbuild/__init__.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/distbuild/__init__.py b/distbuild/__init__.py index 7274f6a9..fa0c3831 100644 --- a/distbuild/__init__.py +++ b/distbuild/__init__.py @@ -37,7 +37,8 @@ from json_router import JsonRouter from helper_router import (HelperRouter, HelperRequest, HelperOutput, HelperResult) from initiator_connection import (InitiatorConnection, InitiatorDisconnect) -from connection_machine import ConnectionMachine, Reconnect, StopConnecting +from connection_machine import (ConnectionMachine, InitiatorConnectionMachine, + Reconnect, StopConnecting) from worker_build_scheduler import (WorkerBuildQueuer, WorkerConnection, WorkerBuildRequest, |