From b2177e9c9684d2b74fb1f62a6d579e9ada883d89 Mon Sep 17 00:00:00 2001
From: Toddy Mladenov <toddysm@gmail.com>
Date: Sun, 7 Apr 2024 21:26:32 -0700
Subject: [PATCH] Org maintainers update (#400)

Addresses https://github.com/notaryproject/.github/issues/66,
https://github.com/notaryproject/.github/issues/67,
https://github.com/notaryproject/.github/issues/68, and
https://github.com/notaryproject/.github/issues/69

Also moved @zr-msft to "in memoriam" :(

---------

Signed-off-by: Toddy Mladenov <toddysm@gmail.com>
---
 CODEOWNERS  |  2 +-
 MAINTAINERS | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/CODEOWNERS b/CODEOWNERS
index b6dd0715..cc79ec5b 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1,2 +1,2 @@
 # Repo-Level Owners (in alphabetical order). Please note this is only for the notaryproject/notaryproject.dev repo
-* @FeynmanZhou @niazfk @iamsamirzon @justincormack @priteshbandi @shizhMSFT @stevelasker @toddysm @vaninrao10 @yizha1 @zr-msft
+* @FeynmanZhou @niazfk @iamsamirzon @priteshbandi @shizhMSFT @toddysm @vaninrao10 @yizha1
diff --git a/MAINTAINERS b/MAINTAINERS
index 26d893d1..710427a3 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1,10 +1,8 @@
 # Org-Level Maintainers (in alphabetical order)
 # Pattern: [First Name] [Last Name] <[Email Address]> ([GitHub Handle])
-Justin Cormack <justin.cormack@docker.com> (@justincormack)
 Niaz Khan <niazfk@amazon.com> (@niazfk)
 Pritesh Bandi <priteshbandi@gmail.com> (@priteshbandi)
 Shiwei Zhang <shizh@microsoft.com> (@shizhMSFT)
-Steve Lasker <StevenLasker@hotmail.com> (@stevelasker)
 Toddy Mladenov <toddysm@gmail.com> (@toddysm)
 
 # Repo-Level Maintainers (in alphabetical order)
@@ -13,4 +11,10 @@ Feynman Zhou <feynmanzhou@microsoft.com> (@FeynmanZhou)
 Samir Kakkar <iamsamir@amazon.com> (@iamsamirzon)
 Vani Rao <vaninrao@amazon.com> (@vaninrao10)
 Yi Zha <yizha1@microsoft.com> (@yizha1)
-Zach Rhoads <zachary.rhoads@microsoft.com> (@zr-msft)
+
+# Emeritus Org Maintainers (in alphabetical order)
+Justin Cormack <justin.cormack@docker.com> (@justincormack)
+Steve Lasker <StevenLasker@hotmail.com> (@stevelasker)
+
+# In memoriam
+Zach Rhoads <zachary.rhoads@microsoft.com> (@zr-msft)
\ No newline at end of file