Merge branch 'main' into sajay

vbatts · web-flow · commit 87911ed7bdd1 · 2022-08-10T06:31:54.000-04:00
diff --git a/.github/PULL_REQUEST_TEMPLATE/maintainer_nomination.md b/.github/PULL_REQUEST_TEMPLATE/maintainer_nomination.md
@@ -0,0 +1,21 @@
+# Nomination for a New Maintainer
+
+## Nominating Maintainer
+
+Name of the existing OCI maintainer with GitHub username
+
+## New Maintainer
+
+Name of the new maintainer with GitHub username
+
+## Justification
+
+Highlight any work contributed by the new maintainer. Examples of contributions may be:
+- Community involvement in mailing lists and meetings
+- Involvement in any OCI working groups
+- Contributions to any of the OCI git repositories
+
+Other considerations may be:
+- Diversity of organizations
+- Time involved in the community
+- Personal experience working with the new maintainer
diff --git a/CODEOWNERS b/CODEOWNERS
@@ -1 +1,3 @@
-* @jonjohnsonjr @jonboulle @sajayantony @stevvooe @vbatts @cyphar
+
+* @jonjohnsonjr @jonboulle @stevvooe @sudo-bmitch @sajayantony @vbatts @cyphar
+
diff --git a/MAINTAINERS b/MAINTAINERS
@@ -1,3 +1,4 @@
+Brandon Mitchell <git@bmitch.net> (@sudo-bmitch)
 Jon Johnson <jonjohnson@google.com> (@jonjohnsonjr)
 Jonathan Boulle <jonathanboulle@gmail.com> (@jonboulle)
 Sajay Antony <sajaya@microsoft.com> (@sajayantony)

-Original file line number
+Diff line change
@@ @@ -1 +1,3 @@ @@
 -* @jonjohnsonjr @jonboulle @sajayantony @stevvooe @vbatts @cyphar
++
 +* @jonjohnsonjr @jonboulle @stevvooe @sudo-bmitch @sajayantony @vbatts @cyphar
++
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+Brandon Mitchell <[email protected]> (@sudo-bmitch)`
`1`	`2`	`Jon Johnson <[email protected]> (@jonjohnsonjr)`
`2`	`3`	`Jonathan Boulle <[email protected]> (@jonboulle)`
`3`	`4`	`Sajay Antony <[email protected]> (@sajayantony)`