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.

Sign up for GitHub

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

Jump to bottom

Backport #9553 to r311 #9554

Merged
merged 1 commit into from
Oct 8, 2024
Merged

Backport #9553 to r311 #9554

merged 1 commit into from
Oct 8, 2024

Conversation

charleskorn
Copy link
Contributor

This PR manually backports #9553 to r311.

@charleskorn
MQE: fix issue where rate or increase can return multiple series …
ccbcf1a 
…with the same labels (#9553)

* Fix the issue where `rate` or `increase` can return multiple series with the same labels

* Add changelog entry

* Disable unsupported upstream test case

(cherry picked from commit 25dadff)

# Conflicts:
#	CHANGELOG.md
#	pkg/streamingpromql/testdata/ours/functions.test
@charleskorn charleskorn changed the base branch from main to r311 October 8, 2024 03:42
@charleskorn charleskorn closed this Oct 8, 2024
@charleskorn charleskorn reopened this Oct 8, 2024
@charleskorn charleskorn marked this pull request as ready for review October 8, 2024 03:54
@charleskorn charleskorn requested a review from a team as a code owner October 8, 2024 03:54
@charleskorn charleskorn enabled auto-merge (squash) October 8, 2024 03:55
@charleskorn charleskorn merged commit a2a5da9 into r311 Oct 8, 2024
31 checks passed
@charleskorn charleskorn deleted the backport-9553-to-r311 branch October 8, 2024 04:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lamida lamida lamida approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@charleskorn @lamida