Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: fix syntax error in CODEOWNERS file #243

Merged
merged 11 commits into from Mar 21, 2023

Conversation

FeynmanZhou
Copy link
Member

@FeynmanZhou FeynmanZhou commented Feb 21, 2023

fix syntax problems in CODEOWNERS and MAINTAINERS

iamsamirzon
iamsamirzon previously approved these changes Feb 21, 2023
toddysm
toddysm previously approved these changes Feb 22, 2023
Copy link
Contributor

@toddysm toddysm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Little nit but for aesthetic purposes we should be consistent in our use of casing :) org-level should be Org-Level for consistency.

yizha1
yizha1 previously approved these changes Feb 22, 2023
Copy link
Contributor

@yizha1 yizha1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@FeynmanZhou FeynmanZhou changed the title fix syntax error in CODEOWNERS file chore: fix syntax error in CODEOWNERS file Feb 24, 2023
FeynmanZhou and others added 7 commits February 24, 2023 22:06
Signed-off-by: Feynman Zhou <feynmanzhou@microsoft.com>
This PR combines all the changes from the following PRs for updating the maintainers for notaryproject/notaryproject sub-project:
Add Milind Gokarn notaryproject#228
Add Pritesh Bandi notaryproject#227
Add Shiwei Zhang notaryproject#234
Add Toddy Mladenov notaryproject#236
Add Vani Rao notaryproject#229
Add Yi Zha notaryproject#237

To keep a balance I dropped Add Feynman Zhou notaryproject#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>
Signed-off-by: Feynman Zhou <feynmanzhou@microsoft.com>

    pick d194f78 fix syntax error in CODEOWNERS file

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

    pick d194f78 fix syntax error in CODEOWNERS file

Signed-off-by: Feynman Zhou <feynmanzhou@microsoft.com>
This PR combines all the changes from the following PRs for updating the maintainers for notaryproject/notaryproject sub-project:
Add Milind Gokarn notaryproject#228
Add Pritesh Bandi notaryproject#227
Add Shiwei Zhang notaryproject#234
Add Toddy Mladenov notaryproject#236
Add Vani Rao notaryproject#229
Add Yi Zha notaryproject#237

To keep a balance I dropped Add Feynman Zhou notaryproject#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>
Signed-off-by: Feynman Zhou <feynmanzhou@microsoft.com>

    pick eaefc35 chore: fix conflicts

Signed-off-by: Feynman Zhou <feynmanzhou@microsoft.com>
Signed-off-by: Feynman Zhou <feynmanzhou@microsoft.com>
Feynman Zhou and others added 2 commits February 24, 2023 22:10
Signed-off-by: Feynman Zhou <feynmanzhou@microsoft.com>
@FeynmanZhou
Copy link
Member Author

I fixed the git signing problem due to the branch policy changes in #226. Please review and re-approve this PR. Thanks

iamsamirzon
iamsamirzon previously approved these changes Feb 24, 2023
CODEOWNERS Outdated Show resolved Hide resolved
MAINTAINERS Outdated Show resolved Hide resolved
vaninrao10
vaninrao10 previously approved these changes Feb 24, 2023
Copy link

@vaninrao10 vaninrao10 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@toddysm good catch on the empty line. @FeynmanZhou please take care.
Rest LGTM

@yizha1
Copy link
Contributor

yizha1 commented Mar 16, 2023

@FeynmanZhou Is this PR still valid? Maybe we can close it.

@toddysm
Copy link
Contributor

toddysm commented Mar 16, 2023

@yizha1 We need to add empty lines at the end of the file. This change was requested some time back. Once this is done, we can metge

Signed-off-by: Feynman Zhou <feynmanzhou@microsoft.com>
@FeynmanZhou FeynmanZhou dismissed stale reviews from vaninrao10 and iamsamirzon via f8b66cb March 20, 2023 12:23
Signed-off-by: Feynman Zhou <feynmanzhou@microsoft.com>
@FeynmanZhou
Copy link
Member Author

Hi @toddysm @iamsamirzon @vaninrao10 @yizha1 @priteshbandi ,

I resolved @toddysm 's comments. Could you pls review and approve it again? Thanks

Copy link
Contributor

@yizha1 yizha1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@justincormack
Copy link
Contributor

Maybe could squash some of this into fewer commits...

@toddysm toddysm merged commit 20b669d into notaryproject:main Mar 21, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

None yet

6 participants