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.

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

rebase: bump github.com/go-jose/go-jose/v3 from 3.0.1 to 3.0.3 #270

Conversation

nixpanic
Copy link
Member

Bumps github.com/go-jose/go-jose/v3 from 3.0.1 to 3.0.3.


updated-dependencies:

  • dependency-name: github.com/go-jose/go-jose/v3
    dependency-type: indirect
    ...

For RHBZ#2268860:
/cherry-pick release-4.15

Bumps [github.com/go-jose/go-jose/v3](https://github.com/go-jose/go-jose) from 3.0.1 to 3.0.3.
- [Release notes](https://github.com/go-jose/go-jose/releases)
- [Changelog](https://github.com/go-jose/go-jose/blob/v3.0.3/CHANGELOG.md)
- [Commits](go-jose/go-jose@v3.0.1...v3.0.3)

---
updated-dependencies:
- dependency-name: github.com/go-jose/go-jose/v3
  dependency-type: indirect
...

Signed-off-by: Niels de Vos <ndevos@ibm.com>
(cherry picked from commit 5298762)
@nixpanic
Copy link
Member Author

/cherry-pick release-4.15

@openshift-cherrypick-robot

@nixpanic: once the present PR merges, I will cherry-pick it on top of release-4.15 in a new PR and assign it to you.

In response to this:

/cherry-pick release-4.15

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/test-infra repository.

@openshift-ci openshift-ci bot added the lgtm Code looks good label Mar 12, 2024
Copy link

openshift-ci bot commented Mar 12, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: iPraveenParihar, nixpanic

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

The pull request process is described here

Needs approval from an approver in each of these files:
  • OWNERS [iPraveenParihar,nixpanic]

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

@openshift-merge-bot openshift-merge-bot bot merged commit 5169391 into red-hat-storage:release-4.16 Mar 12, 2024
9 of 11 checks passed
@openshift-cherrypick-robot

@nixpanic: #270 failed to apply on top of branch "release-4.15":

Applying: rebase: bump github.com/go-jose/go-jose/v3 from 3.0.1 to 3.0.3
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
M	vendor/modules.txt
Falling back to patching base and 3-way merge...
Auto-merging vendor/modules.txt
Removing vendor/github.com/go-jose/go-jose/v3/BUG-BOUNTY.md
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 rebase: bump github.com/go-jose/go-jose/v3 from 3.0.1 to 3.0.3
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-4.15

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/test-infra repository.

@nixpanic
Copy link
Member Author

/cherry-pick release-4.15

See PR #271

openshift-merge-bot bot pushed a commit that referenced this pull request Mar 27, 2024
Syncing red-hat-storage/ceph-csi:devel up to commit 28bc4d1.

Pull-Request #270 introduced a conflict that the resync automation job
could not address. This manual merge should make it possible for the
automation to continue again.

Closes: #279 #280
Signed-off-by: Niels de Vos <ndevos@ibm.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Its a good idea lgtm Code looks good
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants