From db9d4c9cd6c9a1cc61c2d1d5f1eada4d6fdb5358 Mon Sep 17 00:00:00 2001
From: Arnaud Porterie <arnaud.porterie@docker.com>
Date: Tue, 1 Dec 2015 07:56:19 -0800
Subject: [PATCH] Update core maintainers, remove duplicates

Move cpuguy83, duglin, tianon to core maintainers to reflect reality.

Remove james (duplicate for jamtur01) and add [people.jamtur01] section.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: bd2d53af2c6b8da6ab136298650318186cabbdf8
Component: engine
---
 components/engine/MAINTAINERS | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/components/engine/MAINTAINERS b/components/engine/MAINTAINERS
index a8621c6960..1cc20b9d9e 100644
--- a/components/engine/MAINTAINERS
+++ b/components/engine/MAINTAINERS
@@ -219,13 +219,16 @@ made through a pull request.
 
 		people = [
 			"calavera",
+			"cpuguy83",
 			"crosbymichael",
+			"duglin",
 			"erikh",
 			"estesp",
 			"icecrime",
 			"jfrazelle",
 			"lk4d4",
 			"runcom",
+			"tianon",
 			"tibor",
 			"unclejack",
 			"vbatts",
@@ -234,17 +237,15 @@ made through a pull request.
 			"vishh"
 		]
 
-
     [Org."Docs maintainers"]
 
     # TODO Describe the docs maintainers role.
 
         people = [
-            "james",
-            "moxiegirl",
-            "thajeztah",
             "jamtur01",
-            "sven"
+            "moxiegirl",
+            "sven",
+            "thajeztah"
         ]
 
 	[Org.Curators]
@@ -347,6 +348,11 @@ made through a pull request.
 	Email = "arnaud@docker.com"
 	GitHub = "icecrime"
 
+	[people.jamtur01]
+	Name = "James Turnbull"
+	Email = "james@lovedthanlost.net"
+	GitHub = "jamtur01"
+
 	[people.jfrazelle]
 	Name = "Jessie Frazelle"
 	Email = "j@docker.com"