Skip to content

Conversation

@redhat-qe-bot
Copy link
Contributor

cherry-pick #1140 into v4.12

requested-by redhat-qe-bot

Co-authored-by: Meni Yakove <441263+myakove@users.noreply.github.com>
@redhat-qe-bot
Copy link
Contributor Author

The following are automatically added:

  • Add reviewers from OWNER file (in the root of the repository) under reviewers section.
  • Set PR size label.
  • New issue is created for the PR.

Available user actions:

  • To mark PR as verified add /verified to a PR comment, to un-verify add /verified cancel to a PR comment.
    Verified label removed on each new commit push.
  • To cherry pick a merged PR add /cherry-pick <target branch to cherry-pick to> to a PR comment.
  • To add a label by comment use /<label name>, to remove, use /<label name> cancel
    Supported labels:
  • do-not-merge
  • verified
  • wip
  • lgtm
  • target-version-

@sonarqubecloud
Copy link

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
No Duplication information No Duplication information

@rnetser
Copy link
Collaborator

rnetser commented Mar 13, 2023

/verified

@rnetser rnetser merged commit 872cc29 into v4.12 Mar 13, 2023
@rnetser rnetser deleted the auto-cherry-pick-auto-cherry-pick-reformat-black-and-isort branch March 13, 2023 14:01
@rnetser
Copy link
Collaborator

rnetser commented Mar 13, 2023

/cherry-pick v4.11

@redhat-qe-bot
Copy link
Contributor Author

Manual cherry-pick is needed
Cherry pick failed for 872cc29 to v4.11:
error: could not apply 872cc29... Reformat black and isort (#1138) (#1140) (#1142)
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add ' or 'git rm '
hint: and commit the result with 'git commit'

To cherry-pick run:

git checkout v4.11
git checkout -b 872cc29ae4263b953533291fb126376b677bd0a
git cherry-pick 872cc29ae4263b953533291fb126376b677bd0a0
git push origin 872cc29ae4263b953533291fb126376b677bd0a

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