Skip to content
This repository has been archived by the owner on Nov 29, 2021. It is now read-only.

Downgrade required version for psutil to 5.5.1 (backport #453) #454

Merged
merged 3 commits into from
Aug 23, 2021

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Aug 18, 2021

This is an automatic backport of pull request #453 done by Mergify.
Cherry-pick of 4f13f89 has failed:

On branch mergify/bp/master/pr-453
Your branch is up to date with 'origin/master'.

You are currently cherry-picking commit 4f13f89.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   pyproject.toml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

Because the referecen system Debian Buster offers this version.

(cherry picked from commit 4f13f89)

# Conflicts:
#	CHANGELOG.md
@mergify mergify bot requested a review from a team as a code owner August 18, 2021 09:56
@mergify mergify bot added the conflicts label Aug 18, 2021
@jjnicola jjnicola added Conflicts fixed Conflicts were fixed and removed conflicts labels Aug 18, 2021
CHANGELOG.md Outdated
[Unreleased]: https://github.com/greenbone/ospd/compare/v21.4.3...HEAD

## [21.4.3] - 2021-08-04
>>>>>>> 4f13f89 (Downgrade required version for psutil to 5.5.1)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is still not 100% fixed?

@jjnicola jjnicola self-requested a review August 23, 2021 06:42
@jjnicola jjnicola merged commit 90b7eab into master Aug 23, 2021
@jjnicola jjnicola deleted the mergify/bp/master/pr-453 branch August 23, 2021 06:44
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Conflicts fixed Conflicts were fixed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants