From 657358b1bdbbcdb07323ef555fa2732cc27f7ef4 Mon Sep 17 00:00:00 2001
From: Toddy Mladenov <me@toddysm.com>
Date: Mon, 8 Apr 2024 17:06:18 -0700
Subject: [PATCH] Updated org maintainers (#21)

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

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 8084ed8..7982ba1 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1,3 +1,3 @@
 # Repo-Level Owners (in alphabetical order)
 # Note: This is only for the notaryproject/tspclient-go repo
-* @JeyJeyGao @shizhMSFT @Two-Hearts @notaryproject/notaryproject-org-maintainers
+* @gokarnm @JeyJeyGao @niazfk @priteshbandi @shizhMSFT @toddysm @Two-Hearts @vaninrao10 @yizha1
diff --git a/MAINTAINERS b/MAINTAINERS
index dde2b99..8e29912 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)
 # Pattern: [First Name] [Last Name] <[Email Address]> ([GitHub Handle])
@@ -13,3 +13,7 @@ Toddy Mladenov <toddysm@gmail.com> (@toddysm)
 Junjie Gao <junjiegao@microsoft.com> (@JeyJeyGao)
 Patrick Zheng <patrickzheng@microsoft.com> (@Two-Hearts)
 Shiwei Zhang <shizh@microsoft.com> (@shizhMSFT)
+
+# 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