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(deps): update CoreDNS to v1.11.1 (backport of #7523) #7528

Merged
merged 2 commits into from
Aug 23, 2023

Conversation

kumahq[bot]
Copy link
Contributor

@kumahq kumahq bot commented Aug 16, 2023

Automatic cherry-pick of #7523 for branch release-2.0

Generated by action

cherry-picked commit 0e4b2af
⚠️ ⚠️ ⚠️ Conflicts happened when cherry-picking! ⚠️ ⚠️ ⚠️

On branch release-2.0
Your branch is up to date with 'origin/release-2.0'.

You are currently cherry-picking commit 0e4b2af68.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   mk/build.mk

no changes added to commit (use "git add" and/or "git commit -a")

@michaelbeaumont michaelbeaumont enabled auto-merge (squash) August 16, 2023 19:05
Signed-off-by: Mike Beaumont <mjboamail@gmail.com>
Signed-off-by: Mike Beaumont <mjboamail@gmail.com>
@michaelbeaumont michaelbeaumont force-pushed the chore/backport-release-2.0-7523 branch from ea7774f to f4e4556 Compare August 18, 2023 15:43
@lahabana
Copy link
Contributor

@michaelbeaumont should we merge?

@michaelbeaumont michaelbeaumont merged commit b8f3711 into release-2.0 Aug 23, 2023
@michaelbeaumont michaelbeaumont deleted the chore/backport-release-2.0-7523 branch August 23, 2023 13:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants