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

Fixed merge leftovers in a coredns patch. #7823

Merged
merged 3 commits into from
Feb 11, 2024
Merged

Conversation

PawelWMS
Copy link
Contributor

@PawelWMS PawelWMS commented Feb 11, 2024

Merge Checklist

All boxes should be checked before merging the PR (just tick any boxes which don't apply to this PR)

  • The toolchain has been rebuilt successfully (or no changes were made to it)
  • The toolchain/worker package manifests are up-to-date
  • Any updated packages successfully build (or no packages were changed)
  • Packages depending on static components modified in this PR (Golang, *-static subpackages, etc.) have had their Release tag incremented.
  • Package tests (%check section) have been verified with RUN_CHECK=y for existing SPEC files, or added to new SPEC files
  • All package sources are available
  • cgmanifest files are up-to-date and sorted (./cgmanifest.json, ./toolkit/scripts/toolchain/cgmanifest.json, .github/workflows/cgmanifest.json)
  • LICENSE-MAP files are up-to-date (./SPECS/LICENSES-AND-NOTICES/data/licenses.json, ./SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md, ./SPECS/LICENSES-AND-NOTICES/LICENSE-EXCEPTIONS.PHOTON)
  • All source files have up-to-date hashes in the *.signatures.json files
  • sudo make go-tidy-all and sudo make go-test-coverage pass
  • Documentation has been updated to match any changes to the build system
  • Ready to merge

Summary

Fixing a cherry-pick merge error from #7804.

Change Log
Does this affect the toolchain?

No.

Associated issues
Test Methodology

@PawelWMS PawelWMS requested a review from a team as a code owner February 11, 2024 21:31
@PawelWMS
Copy link
Contributor Author

Emergency PR check override to fix a build break blocking the monthly release.

@microsoft/cbl-mariner-devs, if you see a spot an issue with this PR, which should be addressed, please reach out to me!

@PawelWMS PawelWMS merged commit 20f96bc into main Feb 11, 2024
11 checks passed
@PawelWMS PawelWMS deleted the pawelwi/fix_coredns_patch branch February 11, 2024 22:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
main PR Destined for main security
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant