From f03182c42cd8af340e65b5c98c7af62bffe3434d Mon Sep 17 00:00:00 2001
From: Toddy Mladenov <toddysm@gmail.com>
Date: Thu, 11 Jan 2024 13:29:53 -0800
Subject: [PATCH 1/2] Updated the CODEOWNERS and MAINTAINERS files

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

diff --git a/CODEOWNERS b/CODEOWNERS
index ef324db..fac7cf6 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1,3 +1,3 @@
 # Repo-Level Owners (in alphabetical order)
 # Note: This is only for the notaryproject/roadmap repo
-* @FeynmanZhou @justincormack @iamsamirzon @niazfk @priteshbandi @stevelasker @toddysm @vaninrao10 @yizha1
+* @FeynmanZhou @justincormack @iamsamirzon @niazfk @priteshbandi @shizhMSFT @stevelasker @toddysm @vaninrao10 @yizha1
diff --git a/MAINTAINERS b/MAINTAINERS
index a7876d7..212e555 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2,13 +2,14 @@
 # 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)
 # Note: This is for the notaryproject/roadmap repo
 Feynman Zhou <feynmanzhou@microsoft.com> (@FeynmanZhou)
-Pritesh Bandi <priteshbandi@gmail.com> (@priteshbandi)
 Samir Kakkar <iamsamir@amazon.com> (@iamsamirzon)
-Toddy Mladenov <toddysm@gmail.com> (@toddysm)
 Vani Rao <vaninrao@amazon.com> (@vaninrao10)
 Yi Zha <yizha1@microsoft.com> @yizha1

From a420424708eea8b9c890def28cfc06b1c72c4918 Mon Sep 17 00:00:00 2001
From: Toddy Mladenov <toddysm@gmail.com>
Date: Wed, 3 Apr 2024 14:22:37 -0700
Subject: [PATCH 2/2] Updated org maintainers

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

diff --git a/CODEOWNERS b/CODEOWNERS
index fac7cf6..a0db9a6 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1,3 +1,3 @@
 # Repo-Level Owners (in alphabetical order)
 # Note: This is only for the notaryproject/roadmap repo
-* @FeynmanZhou @justincormack @iamsamirzon @niazfk @priteshbandi @shizhMSFT @stevelasker @toddysm @vaninrao10 @yizha1
+* @FeynmanZhou @iamsamirzon @niazfk @priteshbandi @shizhMSFT @toddysm @vaninrao10 @yizha1
diff --git a/MAINTAINERS b/MAINTAINERS
index 212e555..842519c 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1,11 +1,11 @@
 # 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)
+Vani Rao <vaninrao@amazon.com> (@vaninrao10)
+Yi Zha <yizha1@microsoft.com> (@yizha1)
 
 # Repo-Level Maintainers (in alphabetical order)
 # Note: This is for the notaryproject/roadmap repo
@@ -13,3 +13,7 @@ Feynman Zhou <feynmanzhou@microsoft.com> (@FeynmanZhou)
 Samir Kakkar <iamsamir@amazon.com> (@iamsamirzon)
 Vani Rao <vaninrao@amazon.com> (@vaninrao10)
 Yi Zha <yizha1@microsoft.com> @yizha1
+
+# Emeritus Org Maintainers (in alphabetical order)
+Justin Cormack <justin.cormack@docker.com> (@justincormack)
+Steve Lasker <StevenLasker@hotmail.com> (@stevelasker)
\ No newline at end of file