Skip to content

Comments

Fix for a merge conflict#13899

Closed
paul-rogers wants to merge 1 commit intoapache:masterfrom
paul-rogers:230307-botch
Closed

Fix for a merge conflict#13899
paul-rogers wants to merge 1 commit intoapache:masterfrom
paul-rogers:230307-botch

Conversation

@paul-rogers
Copy link
Contributor

Fixes a merge conflict that arose when I merged an older PR on top of more recent changes. The build in that PR was against the master at that time; some files changed since and caused a conflict.

Basically tests checked for old error messages when the merged PR changed those messages.

This PR uses the correct, newer messages.

Release note

No user-visible changes.


  • been self-reviewed.
  • added unit tests or modified existing tests to cover new code paths, ensuring the threshold for code coverage is met.
  • been tested in a test Druid cluster.

Copy link
Member

@clintropolis clintropolis 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 the fix

@clintropolis clintropolis mentioned this pull request Mar 8, 2023
abhishekagarwal87 pushed a commit that referenced this pull request Mar 8, 2023
This PR is #13899 plus spotbugs fix to fix the failures introduced by #13815
@clintropolis
Copy link
Member

fix from this PR is copied into #13901 which has been merged

317brian pushed a commit to 317brian/druid that referenced this pull request Mar 10, 2023
This PR is apache#13899 plus spotbugs fix to fix the failures introduced by apache#13815
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.

2 participants