propellor spin

src/Propellor/Property.hs

@@ -135,7 +135,7 @@ host hn = Host hn [] mempty
 --
 -- Can add Properties and RevertableProperties
 (&) :: IsProp p => Host -> p -> Host
-(Host hn ps is) & p = Host hn (ps ++ [toProp p]) (is <> getInfo p)
+(Host hn ps as) & p = Host hn (ps ++ [toProp p]) (as <> getInfo p)
 
 infixl 1 &
 
@@ -145,14 +145,6 @@ h ! p = h & revert p
 
 infixl 1 !
 
--- | Like (&), but adds the property as the first property of the host.
--- Normally, property order should not matter, but this is useful
--- when it does.
-(&^) :: IsProp p => Host -> p -> Host
-(Host hn ps is) &^ p = Host hn ([toProp p] ++ ps) (getInfo p <> is)
-
-infixl 1 &^
-
 -- Changes the action that is performed to satisfy a property. 
 adjustProperty :: Property -> (Propellor Result -> Propellor Result) -> Property
 adjustProperty p f = p { propertySatisfy = f (propertySatisfy p) }

src/Propellor/Property/Docker.hs

@@ -157,7 +157,7 @@ mkContainer cid@(ContainerId hn _cn) h = Container
 	h' = h
 		-- Restart by default so container comes up on
 		-- boot or when docker is upgraded.
-		&^ restart RestartAlways
+		-- &^ restart RestartAlways
 		-- Expose propellor directory inside the container.
 		& volume (localdir++":"++localdir)
 		-- Name the container in a predictable way so we