Merge branch 'joeyconfig'

Conflicts:
	config.hs

1 files changed, 2 insertions, 0 deletions

diff --git a/TODO b/TODO
index a90875fd..3b816ad3 100644
--- a/TODO
+++ b/TODO
@@ -12,3 +12,5 @@
   says they are unchanged even when they changed and triggered a
   reprovision.
 * Should properties be a tree rather than a list?
+* Only make docker garbage collection run once a day or something
+  to avoid GC after a temp fail.