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

mark ErrTooOldSample as SampleConflict error #6044

Merged
merged 1 commit into from
Jan 13, 2023
Merged

mark ErrTooOldSample as SampleConflict error #6044

merged 1 commit into from
Jan 13, 2023

Conversation

farodin91
Copy link
Contributor

@farodin91 farodin91 commented Jan 13, 2023 •
edited
Loading

Fixes #6040

  • I added CHANGELOG entry for this change.
  • Change is not relevant to the end user.

Changes

Verification

@farodin91 farodin91 force-pushed the mark-ErrTooOldSample-as-SampleConflict-error branch from 206395d to 54a0414 Compare January 13, 2023 15:34
matej-g
matej-g approved these changes Jan 13, 2023
View reviewed changes
Copy link
Collaborator

@matej-g matej-g left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for catching this! I believe this should be conflict error indeed. LGTM pending CI pass 👍.

fpetkovski
fpetkovski approved these changes Jan 13, 2023
View reviewed changes
Copy link
Contributor

@fpetkovski fpetkovski left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@fpetkovski fpetkovski merged commit c45d373 into thanos-io:main Jan 13, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fpetkovski fpetkovski fpetkovski approved these changes

@matej-g matej-g matej-g approved these changes

Assignees
No one assigned
Labels
size/S
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Thanos receiver out of window support - seems to behave interesting
3 participants
@farodin91 @fpetkovski @matej-g