summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2015-09-22 10:40:18 -0700
committerLamont Granquist <lamont@scriptkiddie.org>2015-09-22 10:40:18 -0700
commit871c858dbcec3dabec64474b68feb16372556377 (patch)
treef1099e125788254d153edf4e43df8998a3d2ba64
parentaa01ffbc92de80114089d8fa2ea7d072d0fb2e74 (diff)
parent7580ec078e87225766ceced6233f72f3a728008b (diff)
downloadchef-871c858dbcec3dabec64474b68feb16372556377.tar.gz
Merge pull request #3860 from mwrock/mattmaint
adding matt wrock as maintainer
-rw-r--r--MAINTAINERS.md2
-rw-r--r--MAINTAINERS.toml10
2 files changed, 10 insertions, 2 deletions
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
index aeaebd251d..d270a7c7ac 100644
--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@@ -42,6 +42,7 @@ To mention the team, use @chef/client-core
* [Steven Murawski](https://github.com/smurawski)
* [Tyler Ball](https://github.com/tyler-ball)
* [Ranjib Dey](https://github.com/ranjib)
+* [Matt Wrock](https://github.com/mwrock)
## Dev Tools
@@ -114,6 +115,7 @@ To mention the team, use @chef/client-windows
* [Kartik Cating-Subramanian](https://github.com/ksubrama)
* [Steven Murawski](https://github.com/smurawski)
* [Salim Alam](https://github.com/chefsalim)
+* [Matt Wrock](https://github.com/mwrock)
## Solaris
diff --git a/MAINTAINERS.toml b/MAINTAINERS.toml
index d72b9b316c..ca0a2e67bc 100644
--- a/MAINTAINERS.toml
+++ b/MAINTAINERS.toml
@@ -47,7 +47,8 @@ another component.
"mcquin",
"smurawski",
"tyler-ball",
- "ranjib"
+ "ranjib",
+ "mwrock"
]
[Org.Components.DevTools]
@@ -120,7 +121,8 @@ The specific components of Chef related to a given platform - including (but not
"jaym",
"ksubrama",
"smurawski",
- "chefsalim"
+ "chefsalim",
+ "mwrock"
]
[Org.Components.Subsystems.Solaris]
@@ -325,3 +327,7 @@ The specific components of Chef related to a given platform - including (but not
[people.chefsalim]
Name = "Salim Alam"
GitHub = "chefsalim"
+
+ [people.mwrock]
+ Name = "Matt Wrock"
+ GitHub = "mwrock"