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

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

diff --git a/CODEOWNERS b/CODEOWNERS
index 37b8640..c19e268 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1,3 +1,3 @@
 # Repo-Level Owners (in alphabetical order). Org-level maintainers are included in the linked team at the end
 # For Org level maintainers, refer to https://github.com/notaryproject/.github/blob/main/CODEOWNERS
-* @duffney @shizhMSFT @Two-Hearts @notaryproject/notaryproject-org-maintainers
+* @duffney @justincormack @niazfk @priteshbandi @shizhMSFT @stevelasker @toddysm @Two-Hearts 
diff --git a/MAINTAINERS b/MAINTAINERS
index 7277f06..287e5f4 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1,7 +1,13 @@
-# Org-Level Maintainers are available in https://github.com/notaryproject/.github/blob/main/MAINTAINERS
+# Org-Level Maintainers
+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)
 # Pattern: [First Name] [Last Name] <[Email Address]> ([GitHub Handle])
 # Note: This is for the notaryproject/notation-action repo
 Josh Duffney <jduffney@microsoft.com> (@duffney)
 Patrick Zheng <patrickzheng@microsoft.com> (@Two-Hearts)
-Shiwei Zhang <shizh@microsoft.com> (@shizhMSFT)

From 841bbc41a67f5816feaa9e491cf911824aa1ad40 Mon Sep 17 00:00:00 2001
From: Toddy Mladenov <toddysm@gmail.com>
Date: Wed, 3 Apr 2024 13:59:17 -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 c19e268..19cde35 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1,3 +1,3 @@
 # Repo-Level Owners (in alphabetical order). Org-level maintainers are included in the linked team at the end
 # For Org level maintainers, refer to https://github.com/notaryproject/.github/blob/main/CODEOWNERS
-* @duffney @justincormack @niazfk @priteshbandi @shizhMSFT @stevelasker @toddysm @Two-Hearts 
+* @duffney @niazfk @priteshbandi @shizhMSFT @toddysm @Two-Hearts @vaninrao10 @yizha1
diff --git a/MAINTAINERS b/MAINTAINERS
index 287e5f4..3826af1 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1,13 +1,17 @@
 # Org-Level Maintainers
-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)
 # Pattern: [First Name] [Last Name] <[Email Address]> ([GitHub Handle])
 # Note: This is for the notaryproject/notation-action repo
 Josh Duffney <jduffney@microsoft.com> (@duffney)
 Patrick Zheng <patrickzheng@microsoft.com> (@Two-Hearts)
+
+# 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