From 29add9b6ba356729944bf1ccb790742bdb251210 Mon Sep 17 00:00:00 2001
From: Toddy Mladenov <me@toddysm.com>
Date: Wed, 24 Jan 2024 18:09:29 -0800
Subject: [PATCH] Updated CODEOWNERS and MAINTAINERS files (#6)

Addressing
https://github.com/notaryproject/.github/issues/55
https://github.com/notaryproject/.github/issues/56 and
https://github.com/notaryproject/.github/issues/57

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

diff --git a/CODEOWNERS b/CODEOWNERS
index 1db04f3..e00eb08 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
+# Owners (in alphabetical order)
 # For Org level maintainers, refer to https://github.com/notaryproject/.github/blob/main/CODEOWNERS
-* @gokarnm @JeyJeyGao @priteshbandi @rgnote @shizhMSFT @Two-Hearts @notaryproject/notaryproject-org-maintainers
\ No newline at end of file
+* @gokarnm @JeyJeyGao @justincormack @niazfk @priteshbandi @rgnote @shizhMSFT @stevelasker @toddysm @Two-Hearts 
\ No newline at end of file
diff --git a/MAINTAINERS b/MAINTAINERS
index fda5d8d..2855e95 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1,10 +1,16 @@
-# Org-Level Maintainers are available in https://github.com/notaryproject/.github/blob/main/MAINTAINERS
+# 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)
 # Pattern: [First Name] [Last Name] <[Email Address]> ([GitHub Handle])
 # Note: This is for the notaryproject/notation-plugin-framework-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)