Merge branch 'main' of github.com:opencontainers/image-spec into sajay

jdolitsky · jdolitsky · commit d0cc2b71d651 · 2022-05-10T10:18:23.000-05:00
Signed-off-by: Josh Dolitsky &lt;josh@dolit.ski&gt;
diff --git a/CODEOWNERS b/CODEOWNERS
@@ -1 +1 @@
-* @brendandburns @jonjohnsonjr @jstarks @jonboulle @sajayantony @stevvooe @vbatts @cyphar
+* @jonjohnsonjr @jonboulle @sajayantony @stevvooe @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,6 +1,4 @@
-Brendan Burns <bburns@microsoft.com> (@brendandburns)
 Jon Johnson <jonjohnson@google.com> (@jonjohnsonjr)
-John Starks <jostarks@microsoft.com> (@jstarks)
 Jonathan Boulle <jonathanboulle@gmail.com> (@jonboulle)
 Sajay Antony <sajaya@microsoft.com> (@sajayantony)
 Stephen Day <stevvooe@gmail.com> (@stevvooe)

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-* @brendandburns @jonjohnsonjr @jstarks @jonboulle @sajayantony @stevvooe @vbatts @cyphar`
	`1`	`+* @jonjohnsonjr @jonboulle @sajayantony @stevvooe @vbatts @cyphar`
-Original file line number
+Diff line change
@@ @@ -1,6 +1,4 @@ @@
 -Brendan Burns <[email protected]> (@brendandburns)
 Jon Johnson <[email protected]> (@jonjohnsonjr)
 -John Starks <[email protected]> (@jstarks)
 Jonathan Boulle <[email protected]> (@jonboulle)
 Sajay Antony <[email protected]> (@sajayantony)
 Stephen Day <[email protected]> (@stevvooe)