Repository navigation
Backport of changelog: clarify ENT vs CE patches for 2.1.1 and 2.1.0 into release/2.1.x - #28727
Merged
tgross merged 1 commit intoOct 30, 2026
Conversation
|
|
Due to a mistake in backporting, a changeset of security patches was backported to all Enterprise editions for 2.1.0 but only landed in `main` in the Community Edition. We released a fast-follow 2.1.1 which got these patches into 2.1.1 CE. Because we wanted to include a quick fix to batch queues, we also released 2.1.1 ENT at the same time. In practice, anyone on the 2.1.x line will want to be on 2.1.1 so that they have the bug fixes. But update the changelogs to split out ENT vs CE for 2.1.0 and 2.1.1 so that it's clear which releases contain the security patches.
tgross
force-pushed
the
backport/changelog-2.1.0-vs-2.1.1-patches/openly-heroic-flamingo
branch
from
October 30, 2026 14:44
b88edf9 to
187a3c9
Compare
tgross
marked this pull request as ready for review
October 30, 2026 14:45
jrasell
approved these changes
Oct 30, 2026
tgross
deleted the
backport/changelog-2.1.0-vs-2.1.1-patches/openly-heroic-flamingo
branch
October 30, 2026 15:42
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Backport
This PR is auto-generated from #28726 to be assessed for backporting due to the inclusion of the label backport/2.1.x.
🚨
The person who merged in the original PR is:
@tgross
This person should resolve the merge-conflict(s) by either:
The below text is copied from the body of the original PR.
Due to a mistake in backporting, a changeset of security patches was backported to all Enterprise editions for 2.1.0 but only landed in
mainin the Community Edition. We released a fast-follow 2.1.1 which got these patches into 2.1.1 CE. Because we wanted to include a quick fix to batch queues, we also released 2.1.1 ENT at the same time.In practice, anyone on the 2.1.x line will want to be on 2.1.1 so that they have the bug fixes. But update the changelogs to split out ENT vs CE for 2.1.0 and 2.1.1 so that it's clear which releases contain the security patches.
Changes to Security Controls
Are there any changes to security controls (access controls, encryption, logging) in this pull request? If so, explain.
Overview of commits