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

Merged main -> v2 (2023-04-05) #919

Merged
merged 5 commits into from
Apr 5, 2023

Conversation

nate-double-u
Copy link
Member

Merging main into v2 to keep in sync.

yongtang and others added 5 commits April 3, 2023 11:04
* Add CoreDNS proposals

This PR adds CoreDNS DoQ/DoH3 support as a proposal for sutdent consideration.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>

* Update to include email.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>

* Update summerofcode/2023.md

Co-authored-by: João Henri <joao.henri.cr@gmail.com>
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>

---------

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Co-authored-by: João Henri <joao.henri.cr@gmail.com>
Signed-off-by: Lee Calcote <leecalcote@gmail.com>
Signed-off-by: Lee Calcote <lee.calcote@layer5.io>
Signed-off-by: Mohit Marathe <96789026+mohit-marathe@users.noreply.github.com>
@nate-double-u
Copy link
Member Author

Automerge set to create a merge commit.

Copy link
Collaborator

@jaytiaki jaytiaki left a comment

Choose a reason for hiding this comment

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

/lgtm

@nate-double-u nate-double-u merged commit 741737c into cncf:v2 Apr 5, 2023
@nate-double-u nate-double-u deleted the merged-main-v2-2023-04-05 branch April 5, 2023 22:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants