Merge release-2.12 to main #7798
Merged
Conversation
This file contains 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
#7649) Signed-off-by: Yuri Nikolic <durica.nikolic@grafana.com>
…7661) * Get rid of querier.prefer-streaming-chunks-from-ingesters Signed-off-by: Yuri Nikolic <durica.nikolic@grafana.com> * Fixing a failing test Signed-off-by: Yuri Nikolic <durica.nikolic@grafana.com> * Fixing review findings Signed-off-by: Yuri Nikolic <durica.nikolic@grafana.com> * Fixing failing tests Signed-off-by: Yuri Nikolic <durica.nikolic@grafana.com> * Make lint happy Signed-off-by: Yuri Nikolic <durica.nikolic@grafana.com> * Fixing review findings Signed-off-by: Yuri Nikolic <durica.nikolic@grafana.com> --------- Signed-off-by: Yuri Nikolic <durica.nikolic@grafana.com> (cherry picked from commit 8ed42e1) Co-authored-by: Đurica Yuri Nikolić <durica.nikolic@grafana.com>
Signed-off-by: Yuri Nikolic <durica.nikolic@grafana.com>
* Prepare 2.12 final release * Rebuild jsonnet tests
pr00se
force-pushed
the
merge-release-2.12-to-main
branch
from
7877c85
to
7cd90b9
Compare
pr00se
commented
Apr 3, 2024
| @@ -1 +1 @@ | |||
| 2.11.0 | |||
| 2.12.0 | |||
There was a problem hiding this comment.
I think this is correct, though the instructions here say to leave this as the current version in main. 🤔 I changed this because the merge PR for 2.11 also changed it.
56quarters
approved these changes
Apr 3, 2024
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.
Part of #7542
In this PR I'm merging the release-2.12 branch to main branch. Please merge this PR using a merge commit or by using
tools/release/merge-approved-pr-branch-to-main.shscript.