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

[PLAT-105856] re-apply conflict errors as success #30

Merged
merged 1 commit into from
Apr 10, 2024
Merged

[PLAT-105856] re-apply conflict errors as success #30

merged 1 commit into from
Apr 10, 2024

Conversation

jnyi
Copy link
Collaborator

@jnyi jnyi commented Apr 10, 2024 •
edited
Loading

This change re-applies #27 which was reverted when upgrade to thanos main

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

Changes

Verification

christopherzli
christopherzli approved these changes Apr 10, 2024
View reviewed changes
Copy link

@christopherzli christopherzli left a comment

Choose a reason for hiding this comment

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

LGTM

@jnyi jnyi merged commit aca2382 into databricks:db_main Apr 10, 2024
12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@christopherzli christopherzli christopherzli approved these changes

@yuchen-db yuchen-db Awaiting requested review from yuchen-db

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
@jnyi @christopherzli