Skip to content

Fixed merge leftovers in a coredns patch. - #7823

Merged
Pawel Winogrodzki (PawelWMS) merged 3 commits into
mainfrom
pawelwi/fix_coredns_patch
Feb 11, 2024
Merged

Fixed merge leftovers in a coredns patch.#7823
Pawel Winogrodzki (PawelWMS) merged 3 commits into
mainfrom
pawelwi/fix_coredns_patch

Conversation

@PawelWMS

@PawelWMSPawel Winogrodzki (PawelWMS) commented Feb 11, 2024

Copy link
Copy Markdown
Contributor
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

Copy link
Copy Markdown
ContributorAuthor

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
Pawel Winogrodzki (PawelWMS) deleted the pawelwi/fix_coredns_patch branch February 11, 2024 22:21
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

mainPR Destined for mainsecurity

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant

@PawelWMS