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

Merge release-2.14 to main #10355

Merged
merged 8 commits into from
Jan 6, 2025
Merged

Merge release-2.14 to main #10355

merged 8 commits into from
Jan 6, 2025

Conversation

narqo
Copy link
Contributor

@narqo narqo commented Jan 6, 2025

In this PR I'm merging the release-2.14 branch to main branch. Please merge this PR using a merge commit or by using tools/release/merge-approved-pr-branch-to-main.sh script.

grafanabot and others added 8 commits November 6, 2024 09:49
…alformed queries (#9833)

* query-frontend: Do not break scheduler connection on malformed queries (#9786)

* query-frontend: Do not break scheduler connection on malformed queries

Signed-off-by: Ganesh Vernekar <[email protected]>

* Updated tests

Signed-off-by: Ganesh Vernekar <[email protected]>

* lint

Signed-off-by: Ganesh Vernekar <[email protected]>

---------

Signed-off-by: Ganesh Vernekar <[email protected]>
(cherry picked from commit 587d234)

* update changelog

Signed-off-by: Vladimir Varankin <[email protected]>

---------

Signed-off-by: Vladimir Varankin <[email protected]>
Co-authored-by: Ganesh Vernekar <[email protected]>
Co-authored-by: Vladimir Varankin <[email protected]>
* prepare release 2.14.2

Signed-off-by: Vladimir Varankin <[email protected]>

* rebuild assets

Signed-off-by: Vladimir Varankin <[email protected]>

---------

Signed-off-by: Vladimir Varankin <[email protected]>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
(cherry picked from commit f4756db)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
* update changelog

Signed-off-by: Vladimir Varankin <[email protected]>

* prepare patch release

Signed-off-by: Vladimir Varankin <[email protected]>

* rebuild assets

Signed-off-by: Vladimir Varankin <[email protected]>

---------

Signed-off-by: Vladimir Varankin <[email protected]>
@narqo narqo merged commit e2a60f9 into main Jan 6, 2025
29 checks passed
@narqo narqo deleted the merge-release-2.14-to-main branch January 6, 2025 17:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants