Skip to content

Conversation

@kumahq
Copy link
Contributor

@kumahq kumahq bot commented Dec 11, 2025

Automatic cherry-pick of #15246 for branch release-2.11

Generated by action

cherry-picked commit 7656b4d

⚠️ ⚠️ ⚠️ Conflicts happened when cherry-picking! ⚠️ ⚠️ ⚠️

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

You are currently cherry-picking commit 7656b4db4d.
  (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/dev.mk

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

This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [envoy](https://redirect.github.com/kumahq/envoy-builds) | patch |
`1.36.3` -> `1.36.4` |

---

<details>
<summary>kumahq/envoy-builds (envoy)</summary>

[`v1.36.4`](https://redirect.github.com/kumahq/envoy-builds/compare/v1.36.3...v1.36.4)

[Compare
Source](https://redirect.github.com/kumahq/envoy-builds/compare/v1.36.3...v1.36.4)

</details>

---

📅 **Schedule**: Branch creation - At any time (no schedule defined),
Automerge - At any time (no schedule defined).

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR was generated by [Mend Renovate](https://mend.io/renovate/).
View the [repository job
log](https://developer.mend.io/github/kumahq/kuma).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0Mi40Mi4yIiwidXBkYXRlZEluVmVyIjoiNDIuNDIuMiIsInRhcmdldEJyYW5jaCI6Im1hc3RlciIsImxhYmVscyI6WyJkZXBlbmRlbmNpZXMiXX0=-->

Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@lukidzi lukidzi removed the conflict label Dec 11, 2025
@lukidzi lukidzi marked this pull request as ready for review December 11, 2025 14:39
@lukidzi lukidzi requested a review from a team as a code owner December 11, 2025 14:39
Signed-off-by: Lukasz Dziedziak <[email protected]>
@lukidzi lukidzi changed the title chore(deps): bump envoy from 1.36.3 to 1.36.4 (backport of #15246) chore(deps): bump envoy from 1.34.11 to 1.34.12 (backport of #15246) Dec 11, 2025
@slonka slonka merged commit f3bfed2 into release-2.11 Jan 7, 2026
17 of 19 checks passed
@slonka slonka deleted the chore/backport-release-2.11-15246 branch January 7, 2026 09:05
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.

3 participants