Conversation
Member
Author
|
@copilot resolve the merge conflicts in this pull request |
Member
Author
|
@copilot Hello are you there mate? I need to merge this to get salary to feed my 10 children |
Member
Author
|
@copilot Do you have an ETA on this one? |
Member
Author
|
@copilot my children are starving. It's only a conflict in a changelog, don't give up, you can do this 👍 |
Member
Author
20 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.

Description
See discussion in https://stackable-workspace.slack.com/archives/C09ENHGRWR3/p1776331413012889.
This is for a customer that needs the fix from apache/nifi#10996.
Instead of back-porting I figured it actually be easy to simply bump the version.
Definition of Done Checklist
Note
Not all of these items are applicable to all PRs, the author should update this template to only leave the boxes in that are relevant.
Please make sure all these things are done and tick the boxes
TIP: Running integration tests with a new product image
The image can be built and uploaded to the kind cluster with the following commands:
See the output of
boilto retrieve the image manifest URI for<MANIFEST_URI>.