Synchronize MAINTAINERS files

Signed-off-by: Thom May <thom@chef.io>

2 files changed, 18 insertions, 37 deletions

diff --git a/MAINTAINERS.md b/MAINTAINERS.md
index 6661921583..843c994df2 100644
--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@@ -38,16 +38,15 @@ To mention the team, use @chef/client-core
 * [Jay Mundrawala](https://github.com/jaym)
 * [John Keiser](https://github.com/jkeiser)
 * [Jon Cowie](https://github.com/jonlives)
+* [Joshua Timberman](https://github.com/jtimberman)
 * [Lamont Granquist](https://github.com/lamont-granquist)
 * [Claire McQuin](https://github.com/mcquin)
+* [Matt Wrock](https://github.com/mwrock)
+* [Ranjib Dey](https://github.com/ranjib)
 * [Steven Murawski](https://github.com/smurawski)
+* [Steven Danna](https://github.com/stevendanna)
 * [Tim Smith](https://github.com/tas50)
 * [Tyler Ball](https://github.com/tyler-ball)
-* [Ranjib Dey](https://github.com/ranjib)
-* [Matt Wrock](https://github.com/mwrock)
-* [Joshua Timberman](https://github.com/jtimberman)
-* [Steven Danna](https://github.com/stevendanna)
-
 
 ## Ohai
 
@@ -91,9 +90,9 @@ To mention the team, use @chef/provisioning
 ### Maintainers
 
 * [John Keiser](https://github.com/jkeiser)
-* [Stuart Preston](https://github.com/stuartpreston)
 * [JJ Asghar](https://github.com/jjasghar)
 * [João Cravo](https://github.com/joaogbcravo)
+* [Stuart Preston](https://github.com/stuartpreston)
 * [Harley Alaniz](https://github.com/thehar)
 
 ## Platform Specific Components
@@ -283,3 +282,4 @@ To mention the team, use @chef/client-archlinux
 
 * [Lamont Granquist](https://github.com/lamont-granquist)
 * [Ryan Cragun](https://github.com/ryancragun)
+
diff --git a/MAINTAINERS.toml b/MAINTAINERS.toml
index e78316e144..e5313283f7 100644
--- a/MAINTAINERS.toml
+++ b/MAINTAINERS.toml
@@ -44,45 +44,26 @@ another component.
         "jaym",
         "jkeiser",
         "jonlives",
+        "jtimberman",
         "lamont-granquist",
         "mcquin",
+        "mwrock",
+        "ranjib",
         "smurawski",
+        "stevendanna",
         "tas50",
-        "tyler-ball",
-        "ranjib",
-        "mwrock"
+        "tyler-ball"
       ]
 
-      [Org.Components.Ohai]
-        title = "Ohai"
-        team = "ohai"
-
-        lieutenant = "mcquin"
-
-        maintainers = [
-          "btm",
-          "tas50"
-        ]
+    [Org.Components.Ohai]
+      title = "Ohai"
+      team = "ohai"
 
-    [Org.Components.DevTools]
-      title = "Dev Tools"
-      team = "client-dev-tools"
-      text = "ChefDK, 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/"
-      ]
+      lieutenant = "mcquin"
 
       maintainers = [
-        "danielsdeleo",
-        "jkeiser",
-        "jtimberman",
-        "lamont-granquist",
-        "stevendanna"
+        "btm",
+        "tas50"
       ]
 
     [Org.Components.TestTools]
@@ -110,9 +91,9 @@ Chef Provisioning and Drivers.  Supported Drivers are listed in the [README](htt
 
       maintainers = [
         "jkeiser",
-        "stuartpreston",
         "jjasghar",
         "joaogbcravo",
+        "stuartpreston",
         "thehar"
       ]