Skip to content

update changelog - restic fix#2049

Merged
openshift-merge-bot[bot] merged 1 commit into
backube:mainfrom
falconizmi:changelog-update-fix-restic-env-vars
Jun 24, 2026
Merged

update changelog - restic fix#2049
openshift-merge-bot[bot] merged 1 commit into
backube:mainfrom
falconizmi:changelog-update-fix-restic-env-vars

Conversation

@falconizmi

Copy link
Copy Markdown
Contributor

Describe what this PR does

Is there anything that requires special attention?

Related issues:

Signed-off-by: Ismail Ibrahim Quwarah <iquwarah@redhat.com>
@openshift-ci

openshift-ci Bot commented Jun 24, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: falconizmi

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@tesshuflower

Copy link
Copy Markdown
Contributor

/lgtm

@openshift-ci openshift-ci Bot added the lgtm label Jun 24, 2026
@openshift-merge-bot openshift-merge-bot Bot merged commit 80aa756 into backube:main Jun 24, 2026
34 checks passed
@sonarqubecloud

Copy link
Copy Markdown

@falconizmi

Copy link
Copy Markdown
Contributor Author

/cherry-pick release-0.16

@openshift-cherrypick-robot

Copy link
Copy Markdown

@falconizmi: #2049 failed to apply on top of branch "release-0.16":

Applying: update changelog - restic fix
Using index info to reconstruct a base tree...
M	CHANGELOG.md
Falling back to patching base and 3-way merge...
Auto-merging CHANGELOG.md
CONFLICT (content): Merge conflict in CHANGELOG.md
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 update changelog - restic fix

Details

In response to this:

/cherry-pick release-0.16

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants