Merge branch 'main' into brandon

opencontainers · May 10, 2022 · a9609d2 · a9609d2
2 parents aa4ed36 + 37d82a2
commit a9609d2
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/CODEOWNERS b/CODEOWNERS
@@ -1 +1 @@
-* @brendandburns @jonjohnsonjr @jstarks @jonboulle @stevvooe @sudo-bmitch @vbatts @cyphar
+* @jonjohnsonjr @jonboulle @stevvooe @sudo-bmitch @vbatts @cyphar
diff --git a/EMERITUS.md b/EMERITUS.md
@@ -1,7 +1,9 @@
 We would like to acknowledge previous OCI image spec maintainers and their huge contributions to our collective success:
 
 * Brandon Philips (@philips)
+* Brendan Burns (@brendandburns)
 * Jason Bouzane (@jbouzane)
+* John Starks (@jstarks)
 * Keyang Xie (@xiekeyang)
 
 We thank these members for their service to the OCI community.
diff --git a/MAINTAINERS b/MAINTAINERS
@@ -1,8 +1,6 @@
 Brandon Mitchell <[email protected]> (@sudo-bmitch)
-Brendan Burns <[email protected]> (@brendandburns)
 Jon Johnson <[email protected]> (@jonjohnsonjr)
-John Starks <[email protected]> (@jstarks)
 Jonathan Boulle <[email protected]> (@jonboulle)
 Stephen Day <[email protected]> (@stevvooe)
 Vincent Batts <[email protected]> (@vbatts)
-Aleksa Sarai <[email protected]> (@cyphar)
+Aleksa Sarai <[email protected]> (@cyphar)
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		* @brendandburns @jonjohnsonjr @jstarks @jonboulle @stevvooe @sudo-bmitch @vbatts @cyphar
		* @jonjohnsonjr @jonboulle @stevvooe @sudo-bmitch @vbatts @cyphar