summaryrefslogtreecommitdiff
path: root/src/Propellor/Property/Docker.hs
diff options
context:
space:
mode:
authorJoey Hess2015-11-01 16:53:25 -0400
committerJoey Hess2015-11-01 16:53:25 -0400
commit592c65d02bf07d053d2fbe8a568f88d1b28e1a65 (patch)
tree49a3c1a7aa976043d72ee396681fe11ddd3e0194 /src/Propellor/Property/Docker.hs
parent4d63a9f0ad327cba305e239e51d02e5e33213eda (diff)
merge from concurrent-output
Diffstat (limited to 'src/Propellor/Property/Docker.hs')
-rw-r--r--src/Propellor/Property/Docker.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Propellor/Property/Docker.hs b/src/Propellor/Property/Docker.hs
index f2dbaaf5..0cc8212b 100644
--- a/src/Propellor/Property/Docker.hs
+++ b/src/Propellor/Property/Docker.hs
@@ -56,7 +56,6 @@ import qualified Propellor.Property.Cmd as Cmd
import qualified Propellor.Shim as Shim
import Utility.Path
import Utility.ThreadScheduler
-import Utility.ConcurrentOutput
import Control.Concurrent.Async hiding (link)
import System.Posix.Directory
@@ -65,6 +64,7 @@ import Prelude hiding (init)
import Data.List hiding (init)
import Data.List.Utils
import qualified Data.Map as M
+import System.Console.Concurrent
installed :: Property NoInfo
installed = Apt.installed ["docker.io"]