Skip to content

Backport #9874 to r314 #9877

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
Merged
merged 1 commit into from
Nov 12, 2024
Merged

Backport #9874 to r314 #9877

merged 1 commit into from
Nov 12, 2024

Conversation

charleskorn
Copy link
Contributor

@charleskorn
MQE: fix or where both sides have series with the same labels (#9874)
afa5fa9 
* MQE: fix `or` where both sides have series with the same labels

* Add changelog entry

# Conflicts:
#	CHANGELOG.md

* Address PR feedback: move `operators.NewDeduplicateAndMerge` to `NewOrBinaryOperation` to make test stronger

(cherry picked from commit b873372)

# Conflicts:
#	CHANGELOG.md
@charleskorn charleskorn marked this pull request as ready for review November 12, 2024 02:13
@charleskorn charleskorn requested a review from a team as a code owner November 12, 2024 02:13
@charleskorn charleskorn enabled auto-merge (squash) November 12, 2024 02:16
@charleskorn charleskorn merged commit a4033f6 into r314 Nov 12, 2024
29 checks passed
@charleskorn charleskorn deleted the backport-9874-to-r314 branch November 12, 2024 02:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jhesketh jhesketh jhesketh 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 @jhesketh