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

v3.8.1 Changelog Bump #1721

Merged
merged 1 commit into from Jan 24, 2023
Merged

v3.8.1 Changelog Bump #1721

merged 1 commit into from Jan 24, 2023

Conversation

github-actions[bot]
Copy link
Contributor

This is an automated changelog commit.

Signed-off-by: GitHub <noreply@github.com>
@app-sre-bot
Copy link
Collaborator

Can one of the admins verify this patch?

@dmage dmage merged commit ff498b3 into master Jan 24, 2023
@dmage
Copy link
Member

dmage commented Jan 24, 2023

/cherrypick redhat-3.8

@openshift-cherrypick-robot

@dmage: #1721 failed to apply on top of branch "redhat-3.8":

Applying: chore: v3.8.1 changelog bump (PROJQUAY-4716)
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
Patch failed at 0001 chore: v3.8.1 changelog bump (PROJQUAY-4716)
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:

/cherrypick redhat-3.8

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.

@dmage
Copy link
Member

dmage commented Jan 24, 2023

/cherrypick redhat-3.8

@openshift-cherrypick-robot

@dmage: new pull request created: #1723

In response to this:

/cherrypick redhat-3.8

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.

@dmage dmage deleted the ready-v3.8.1 branch July 19, 2023 21:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
3 participants