summaryrefslogtreecommitdiff
path: root/src/Propellor/Property/Spin.hs
diff options
context:
space:
mode:
authorJoey Hess2015-10-20 12:06:35 -0400
committerJoey Hess2015-10-20 12:06:35 -0400
commit9b7719c2c78f1e6f3d012bb76aca7efa1df7faac (patch)
tree736397753e2064407fb8befee07b325fbc055540 /src/Propellor/Property/Spin.hs
parent650b7659cf07f1da31bcf51eb139af28d5bc8bb1 (diff)
parent05d35eb568e74deafc936e6735171291410b5f0b (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'src/Propellor/Property/Spin.hs')
-rw-r--r--src/Propellor/Property/Spin.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Propellor/Property/Spin.hs b/src/Propellor/Property/Spin.hs
index ead85f59..5f857ef4 100644
--- a/src/Propellor/Property/Spin.hs
+++ b/src/Propellor/Property/Spin.hs
@@ -125,7 +125,7 @@ cdesc n = "controller for " ++ n
-- To detect loops of controlled hosts, each Host's info contains a list
-- of the hosts it's controlling.
newtype Controlling = Controlled [Host]
- deriving (Typeable, Monoid)
+ deriving (Typeable, Monoid, Show)
isControlledBy :: Host -> Controlling -> Bool
h `isControlledBy` (Controlled hs) = any (== hostName h) (map hostName hs)