From 34cbbb270b3eb877c84e5c528d0b218dbf7be904 Mon Sep 17 00:00:00 2001
From: David Lawrence <david.lawrence@docker.com>
Date: Tue, 27 Oct 2015 22:59:23 -0700
Subject: [PATCH] updating maintainers and adding top level contributors,
 removing those files from tuf dir Signed-off-by: David Lawrence
 <david.lawrence@docker.com> (github: endophage)

---
 tuf/CONTRIBUTORS => CONTRIBUTORS | 1 +
 MAINTAINERS                      | 2 +-
 tuf/MAINTAINERS                  | 1 -
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename tuf/CONTRIBUTORS => CONTRIBUTORS (69%)
 delete mode 100644 tuf/MAINTAINERS

diff --git a/tuf/CONTRIBUTORS b/CONTRIBUTORS
similarity index 69%
rename from tuf/CONTRIBUTORS
rename to CONTRIBUTORS
index 5f484889cb..4bc6c09681 100644
--- a/tuf/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1,3 +1,4 @@
+David Williamson <david.williamson@docker.com> (github: davidwilliamson)
 Aaron Lehmann <aaron.lehmann@docker.com> (github: aaronlehmann)
 Lewis Marshall <lewis@flynn.io> (github: lmars)
 Jonathan Rudenberg <jonathan@flynn.io> (github: titanous)
diff --git a/MAINTAINERS b/MAINTAINERS
index ce9eedb21a..6112e92a2f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1,5 +1,5 @@
-Olivier Gambier <olivier@docker.com> (@dmp42)
 David Lawrence <david.lawrence@docker.com> (@endophage)
+Ying Li <ying.li@docker.com> (@cyli)
 Nathan McCauley <nathan.mccauley@docker.com> (@NathanMcCauley)
 Derek McGowan <derek@docker.com> (@dmcgowan)
 Diogo Monica <diogo@docker.com> (@diogomonica)
diff --git a/tuf/MAINTAINERS b/tuf/MAINTAINERS
deleted file mode 100644
index d7dda3f4fc..0000000000
--- a/tuf/MAINTAINERS
+++ /dev/null
@@ -1 +0,0 @@
-David Lawrence <david.lawrence@docker.com> (github: endophage)