Merge release 1.18 to master #6190
Merged
Conversation
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
danielblando
force-pushed
the
merge-release-1.18-to-master
branch
from
6d93dbe to
35b2dfa
Compare
Signed-off-by: Daniel Blando <[email protected]>
Signed-off-by: Daniel Blando <[email protected]>
danielblando
force-pushed
the
merge-release-1.18-to-master
branch
from
35b2dfa to
4619723
Compare
yeya24
reviewed
Sep 4, 2024
| * [CHANGE] QueryFrontend/QueryScheduler: Deprecate `-querier.max-outstanding-requests-per-tenant` and `-query-scheduler.max-outstanding-requests-per-tenant` flags. Use frontend.max-outstanding-requests-per-tenant instead. #6146 | ||
| * [CHANGE] Ingesters: Enable 'snappy-block' compression on ingester clients by default. #6148 | ||
| * [CHANGE] Ruler: Scheduling `ruler.evaluation-delay-duration` to be deprecated. Use the highest value between `ruler.evaluation-delay-duration` and `ruler.query-offset` #6149 | ||
| * [CHANGE] Ruler: Scheduling `ruler.evaluation-delay-duration` to be deprecated. Ruler will use the highest value between `ruler.evaluation-delay-duration` and `ruler.query-offset` #6149 |
There was a problem hiding this comment.
If we need to modify changelog content let's update in the release branch first then merge back to master?
There was a problem hiding this comment.
These changes are already on the release branch. We are just bringing it to master now
https://github.com/cortexproject/cortex/blob/release-1.18/CHANGELOG.md?plain=1#L15
There was a problem hiding this comment.
I see. Thanks for the clarification
yeya24
approved these changes
Sep 4, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Please merge this PR with merge commit, do not squash
What this PR does:
Which issue(s) this PR fixes:
Fixes #
Checklist
CHANGELOG.mdupdated - the order of entries should be[CHANGE],[FEATURE],[ENHANCEMENT],[BUGFIX]