diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-03-11 10:41:49 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-03-11 10:41:49 +0000 |
| commit | 68395a12c79c22e266b4a06095533e38da6e29d0 (patch) | |
| tree | f004fb3122bac502b127faf70e868bd56a0cb409 /distbuild/__init__.py | |
| parent | 11559bbbd24c218d512d503df27157668b37bdc9 (diff) | |
| parent | eba2e42855e9413f035e5093d64543184dce6fae (diff) | |
| download | morph-68395a12c79c22e266b4a06095533e38da6e29d0.tar.gz | |
Merge branch 'sam/distbuild-build-logs'
Reviewed-By: Adam Coldrick <adam.coldrick@codethink.co.uk>
Reviewed-By: Richard Maw <richard.maw@codethink.co.uk>
Diffstat (limited to 'distbuild/__init__.py')
| -rw-r--r-- | distbuild/__init__.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/distbuild/__init__.py b/distbuild/__init__.py index 52ad2cc2..62a904d4 100644 --- a/distbuild/__init__.py +++ b/distbuild/__init__.py @@ -1,6 +1,6 @@ # distbuild/__init__.py -- library for Morph's distributed build plugin # -# Copyright (C) 2012, 2014 Codethink Limited +# Copyright (C) 2012, 2014-2015 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -51,9 +51,8 @@ from worker_build_scheduler import (WorkerBuildQueuer, WorkerBuildFailed, WorkerBuildStepStarted) from build_controller import (BuildController, BuildFailed, BuildProgress, - BuildSteps, BuildStepStarted, - BuildStepAlreadyStarted, BuildOutput, - BuildStepFinished, BuildStepFailed, + BuildStepStarted, BuildStepAlreadyStarted, + BuildOutput, BuildStepFinished, BuildStepFailed, BuildFinished, BuildCancel, build_step_name, map_build_graph) from initiator import Initiator |