From 19e6614eeb31d6a986ef61486e15aeb09cc952b8 Mon Sep 17 00:00:00 2001
From: Solomon Hykes <solomon@docker.com>
Date: Mon, 21 Apr 2014 17:01:34 -0700
Subject: [PATCH] Clean up MAINTAINERS files

* Remove out of date "vacation mode"
* Fix my email address
* Remove infrastructure maintainers to reflect reality (core maintainers
are currently maintaining their own infrastructure).

Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
---
 MAINTAINERS                     | 2 +-
 engine/MAINTAINERS              | 2 +-
 hack/infrastructure/MAINTAINERS | 2 --
 3 files changed, 2 insertions(+), 4 deletions(-)
 delete mode 100644 hack/infrastructure/MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index d1f4d15491..581953cf8d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1,4 +1,4 @@
-Solomon Hykes <solomon@dotcloud.com> (@shykes)
+Solomon Hykes <solomon@docker.com> (@shykes)
 Guillaume J. Charmes <guillaume@docker.com> (@creack)
 Victor Vieux <vieux@docker.com> (@vieux)
 Michael Crosby <michael@crosbymichael.com> (@crosbymichael)
diff --git a/engine/MAINTAINERS b/engine/MAINTAINERS
index 354798f72e..db33365bcd 100644
--- a/engine/MAINTAINERS
+++ b/engine/MAINTAINERS
@@ -1 +1 @@
-#Solomon Hykes <solomon@dotcloud.com> Temporarily unavailable
+Solomon Hykes <solomon@docker.com>
diff --git a/hack/infrastructure/MAINTAINERS b/hack/infrastructure/MAINTAINERS
deleted file mode 100644
index bd089c55f4..0000000000
--- a/hack/infrastructure/MAINTAINERS
+++ /dev/null
@@ -1,2 +0,0 @@
-Ken Cochrane <ken@dotcloud.com> (@kencochrane)
-Jerome Petazzoni <jerome@dotcloud.com> (@jpetazzo)