summaryrefslogtreecommitdiff
path: root/src/Propellor/Property/Docker.hs
diff options
context:
space:
mode:
authorJoey Hess2015-11-08 14:50:21 -0400
committerJoey Hess2015-11-08 14:50:21 -0400
commitd7e140aeae8a8ea47976ca1f3e29c4d0b00eacee (patch)
tree31aa4bbf775879dddb307f9d1c99ac84287ca909 /src/Propellor/Property/Docker.hs
parentf85b7d1bdc9019fd63c5037094f514a7c7ace8d2 (diff)
parentd50aa85052b1f35021072ea95bc51b5c46c797b0 (diff)
Merge branch 'joeyconfig'
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"]