Squash

Signed-off-by: Mike Dodge <mikedodge04@fb.com>

1 files changed, 71 insertions, 41 deletions

diff --git a/MAINTAINERS.toml b/MAINTAINERS.toml
index 12eb536fa3..10e7655cd8 100644
--- a/MAINTAINERS.toml
+++ b/MAINTAINERS.toml
@@ -12,7 +12,7 @@ file tells you who needs to review your patch - you need a simple majority of ma
 for the relevant subsystems to provide a :+1: on your pull request. Additionally, you need
 to not receive a veto from a Lieutenant or the Project Lead.
 
-Check out [How Chef is Maintained](https://github.com/opscode/chef-rfc/blob/master/rfc030-maintenance-policy.md#how-the-project-is-maintained) for details on the process, how to become
+Check out [How Chef is Maintained](https://github.com/chef/chef-rfc/blob/master/rfc030-maintenance-policy.md#how-the-project-is-maintained) for details on the process, how to become
 a maintainer, lieutenant, or the project lead.
 """
 
@@ -28,9 +28,7 @@ a maintainer, lieutenant, or the project lead.
       title = "Chef Core"
       team = "client-core"
       text = """
-Handles the core parts of the Chef DSL, base resource and provider
-infrastructure, the Chef applications and [omnibus-chef](https://github.com/chef/omnibus-chef). Includes anything not covered by
-another component.
+Maintainers for the Chef client, Ohai, mixlibs, ChefDK, ChefSpec, Foodcritic, chefstyle, and sundry others.
 """
 
       lieutenant = "thommay"
@@ -42,46 +40,35 @@ another component.
         "fujin",
         "jaymzh",
         "jaym",
+        "jkeiser",
         "jonlives",
+        "jtimberman",
         "lamont-granquist",
         "mcquin",
-        "smurawski",
-        "tyler-ball",
+        "mwrock",
         "ranjib",
-        "mwrock"
-      ]
-
-    [Org.Components.DevTools]
-      title = "Dev Tools"
-      team = "client-dev-tools"
-      text = "Chef Zero, Knife, Chef Apply and Chef Shell."
-
-      paths = [
-        "lib/chef/knife.rb",
-        "lib/chef/knife/",
-        "spec/functional/knife/",
-        "spec/integration/knife/",
-        "spec/unit/knife/"
-      ]
-
-      maintainers = [
-        "danielsdeleo",
-        "jtimberman",
-        "lamont-granquist",
-        "stevendanna"
+        "smurawski",
+        "stevendanna",
+        "tas50",
+        "tduffield",
+        "tyler-ball"
       ]
 
-    [Org.Components.TestTools]
-      title = "Test Tools"
-      team = "client-test-tools"
-      text = "ChefSpec"
+    [Org.Components.Provisioning]
+      title = "Chef Provisioning"
+      team = "provisioning"
+      text = """
+Chef Provisioning and Drivers.  Supported Drivers are listed in the [README](https://github.com/chef/chef-provisioning/blob/master/README.md#chef-provisioning).
+"""
 
-      lieutenant = "sethvargo"
+      lieutenant = "tyler-ball"
 
       maintainers = [
-        "jtimberman",
-        "lamont-granquist",
-        "ranjib"
+        "jkeiser",
+        "jjasghar",
+        "joaogbcravo",
+        "stuartpreston",
+        "thehar"
       ]
 
     [Org.Components.Subsystems]
@@ -109,6 +96,7 @@ The specific components of Chef related to a given platform - including (but not
 
         maintainers = [
           "lamont-granquist",
+          "tas50",
           "thommay"
         ]
 
@@ -148,7 +136,8 @@ The specific components of Chef related to a given platform - including (but not
         lieutenant = "jtimberman"
 
         maintainers = [
-          "tyler-ball"
+          "tyler-ball",
+          "mikedodge04"
         ]
 
       [Org.Components.Subsystems.Debian]
@@ -158,7 +147,8 @@ The specific components of Chef related to a given platform - including (but not
         lieutenant = "thommay"
 
         maintainers = [
-          "lamont-granquist"
+          "lamont-granquist",
+          "tas50"
         ]
 
     [Org.Components.Subsystems.Fedora]
@@ -174,7 +164,8 @@ The specific components of Chef related to a given platform - including (but not
         team = "client-opensuse"
 
         maintainers = [
-          "lamont-granquist"
+          "lamont-granquist",
+          "tas50"
         ]
 
       [Org.Components.Subsystems."SUSE Enterprise Linux"]
@@ -194,7 +185,7 @@ The specific components of Chef related to a given platform - including (but not
         maintainers = [
           "Aevin1387",
           "tBunnyMan",
-          "agentmeerkat"
+          "AgentMeerkat"
         ]
 
       [Org.Components.Subsystems.OpenBSD]
@@ -237,9 +228,9 @@ The specific components of Chef related to a given platform - including (but not
     Name = "Cory Stephenson"
     GitHub = "Aevin1387"
 
-  [people.agentmeerkat]
+  [people.AgentMeerkat]
     Name = "Bryant Lippert"
-    GitHub = "agentmeerkat"
+    GitHub = "AgentMeerkat"
 
   [people.btm]
     Name = "Bryan McLellan"
@@ -336,3 +327,42 @@ The specific components of Chef related to a given platform - including (but not
   [people.mwrock]
     Name = "Matt Wrock"
     GitHub = "mwrock"
+
+  [people.tas50]
+    Name = "Tim Smith"
+    GitHub = "tas50"
+    Twitter = "tas50"
+    IRC = "tas50"
+
+  [people.jkeiser]
+    Name = "John Keiser"
+    GitHub = "jkeiser"
+
+  [people.stuartpreston]
+    Name = "Stuart Preston"
+    GitHub = "stuartpreston"
+
+  [people.jjasghar]
+    Name = "JJ Asghar"
+    GitHub = "jjasghar"
+    Twitter = "jjasghar"
+    IRC = "j^2"
+
+  [people.joaogbcravo]
+    Name = "João Cravo"
+    GitHub = "joaogbcravo"
+    Twitter = "joaogbcravo"
+
+  [people.thehar]
+    Name = "Harley Alaniz"
+    GitHub = "thehar"
+
+  [people.tduffield]
+    Name = "Tom Duffield"
+    GitHub = "tduffield"
+
+  [people.mikedodge04]
+    Name = "mikedodge04"
+    GitHub = "mikedodge04"
+    Twitter = "mikedodge04"
+    IRC = "mikedodge04"