From d14f76e9f2fb32519806ea24d2eee41a8eefa32e Mon Sep 17 00:00:00 2001
From: Toddy Mladenov <toddysm@gmail.com>
Date: Thu, 11 Jan 2024 11:13:04 -0800
Subject: [PATCH 1/2] Updated the maintainers and codeowners 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 e20e3a2c..047bd780 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1,3 +1,3 @@
 # Repo-Level Owners (in alphabetical order)
 # Note: This is only for the notaryproject/notation-core-go repo
-* @gokarnm @JeyJeyGao @justincormack @niazfk @priteshbandi @rgnote @shizhMSFT @stevelasker @Two-Hearts
+* @gokarnm @JeyJeyGao @justincormack @niazfk @priteshbandi @rgnote @shizhMSFT @stevelasker @toddysm @Two-Hearts
diff --git a/MAINTAINERS b/MAINTAINERS
index 1f62496b..c6f34e95 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/notation-core-go repo
 Junjie Gao <junjiegao@microsoft.com> (@JeyJeyGao)
 Milind Gokarn <gokarnm@amazon.com> (@gokarnm)
 Patrick Zheng <patrickzheng@microsoft.com> (@Two-Hearts)
-Pritesh Bandi <priteshbandi@gmail.com> (@priteshbandi)
 Rakesh Gariganti <garigant@amazon.com> (@rgnote)
-Shiwei Zhang <shizh@microsoft.com> (@shizhMSFT)

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

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

diff --git a/CODEOWNERS b/CODEOWNERS
index 047bd780..84233dd7 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1,3 +1,3 @@
 # Repo-Level Owners (in alphabetical order)
 # Note: This is only for the notaryproject/notation-core-go repo
-* @gokarnm @JeyJeyGao @justincormack @niazfk @priteshbandi @rgnote @shizhMSFT @stevelasker @toddysm @Two-Hearts
+* @gokarnm @JeyJeyGao @niazfk @priteshbandi @rgnote @shizhMSFT @toddysm @Two-Hearts @vaninrao10 @yizha1
diff --git a/MAINTAINERS b/MAINTAINERS
index c6f34e95..07f512e5 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1,11 +1,12 @@
 # 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/notation-core-go repo
@@ -13,3 +14,7 @@ Junjie Gao <junjiegao@microsoft.com> (@JeyJeyGao)
 Milind Gokarn <gokarnm@amazon.com> (@gokarnm)
 Patrick Zheng <patrickzheng@microsoft.com> (@Two-Hearts)
 Rakesh Gariganti <garigant@amazon.com> (@rgnote)
+
+# 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