Skip to content

Commit

Permalink
chore: fix syntax error in CODEOWNERS file (#243)
Browse files Browse the repository at this point in the history
* doc: Add Yi as a notaryproject maintainer

Signed-off-by: Feynman Zhou <feynmanzhou@microsoft.com>

* Added CODEOWNERS and MAINTAINERS files (#240)

This PR combines all the changes from the following PRs for updating the maintainers for notaryproject/notaryproject sub-project:
Add Milind Gokarn #228
Add Pritesh Bandi #227
Add Shiwei Zhang #234
Add Toddy Mladenov #236
Add Vani Rao #229
Add Yi Zha #237

To keep a balance I dropped Add Feynman Zhou #235. The proposal is to abandon the above PRs and merge only this one.

Signed-off-by: Toddy Mladenov toddysm@gmail.com
Signed-off-by: Feynman Zhou <feynmanzhou@microsoft.com>

* fix syntax error in CODEOWNERS file

Signed-off-by: Feynman Zhou <feynmanzhou@microsoft.com>

    pick d194f78 fix syntax error in CODEOWNERS file

Signed-off-by: Feynman Zhou <feynmanzhou@microsoft.com>

* fix syntax error in CODEOWNERS file

Signed-off-by: Feynman Zhou <feynmanzhou@microsoft.com>

    pick d194f78 fix syntax error in CODEOWNERS file

Signed-off-by: Feynman Zhou <feynmanzhou@microsoft.com>

* Added CODEOWNERS and MAINTAINERS files (#240)

This PR combines all the changes from the following PRs for updating the maintainers for notaryproject/notaryproject sub-project:
Add Milind Gokarn #228
Add Pritesh Bandi #227
Add Shiwei Zhang #234
Add Toddy Mladenov #236
Add Vani Rao #229
Add Yi Zha #237

To keep a balance I dropped Add Feynman Zhou #235. The proposal is to abandon the above PRs and merge only this one.

Signed-off-by: Toddy Mladenov toddysm@gmail.com
Signed-off-by: Feynman Zhou <feynmanzhou@microsoft.com>

* chore: fix conflicts

Signed-off-by: Feynman Zhou <feynmanzhou@microsoft.com>

    pick eaefc35 chore: fix conflicts

Signed-off-by: Feynman Zhou <feynmanzhou@microsoft.com>

* fix conflicts

Signed-off-by: Feynman Zhou <feynmanzhou@microsoft.com>

* fix git signing problem

Signed-off-by: Feynman Zhou <feynmanzhou@microsoft.com>

* add a new line at the end

Signed-off-by: Feynman Zhou <feynmanzhou@microsoft.com>

* fix syntax in MAINTAINERS

Signed-off-by: Feynman Zhou <feynmanzhou@microsoft.com>

---------

Signed-off-by: Feynman Zhou <feynmanzhou@microsoft.com>
Signed-off-by: Toddy Mladenov toddysm@gmail.com
Co-authored-by: Toddy Mladenov <me@toddysm.com>
  • Loading branch information
Feynman Zhou and toddysm committed Mar 21, 2023
1 parent 62ae4cf commit 20b669d
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 14 deletions.
15 changes: 2 additions & 13 deletions CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,13 +1,2 @@
# Org-Level Owners (in alphabetical order)
* @justincormack
* @niazfk
* @stevelasker

# Repo-Level Owners (in alphabetical order)
# Note: This is only for the notaryproject/notaryproject repo
* @gokarnm
* @priteshbandi
* @shizhMSFT
* @toddysm
* @vaninrao10
* @yizha1
# Org-Level and repo-Level Owners (in alphabetical order). Please note this is only for the notaryproject/notaryproject repo
* @gokarnm @justincormack @niazfk @priteshbandi @stevelasker @shizhMSFT @toddysm @vaninrao10 @yizha1
2 changes: 1 addition & 1 deletion MAINTAINERS
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ Pritesh Bandi <priteshbandi@gmail.com> (@priteshbandi)
Shiwei Zhang <shizh@microsoft.com> (@shizhMSFT)
Toddy Mladenov <toddysm@gmail.com> (@toddysm)
Vani Rao <vaninrao@amazon.com> (@vaninrao10)
Yi Zha <yizha1@microsoft.com> @yizha1
Yi Zha <yizha1@microsoft.com> (@yizha1)

0 comments on commit 20b669d

Please sign in to comment.