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

Use better defaults for for ospd-openvas settings (backport #454) #456

Merged
merged 4 commits into from
Jul 1, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 1, 2021

This is an automatic backport of pull request #454 done by Mergify.
Cherry-pick of 3e55439 has failed:

On branch mergify/bp/master/pr-454
Your branch is ahead of 'origin/master' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 3e55439.
  (all conflicts fixed: 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)

nothing to commit, working tree clean

Cherry-pick of e92f4b6 has failed:

On branch mergify/bp/master/pr-454
Your branch is ahead of 'origin/master' by 3 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit e92f4b6.
  (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)

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

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://help.github.com/articles/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/

* Make the service file usable for real scenarios
* Use better file names for configs
* In service file load configs from /etc/gvm

(cherry picked from commit f631e18)
(cherry picked from commit aff2854)
@mergify mergify bot requested a review from a team as a code owner July 1, 2021 12:04
@mergify mergify bot added the conflicts label Jul 1, 2021
Fix changelog for 20.8 releases.
@bjoernricks bjoernricks force-pushed the mergify/bp/master/pr-454 branch from 0358b01 to b1fe933 Compare July 1, 2021 12:28
@bjoernricks bjoernricks merged commit 9b3e231 into master Jul 1, 2021
@bjoernricks bjoernricks deleted the mergify/bp/master/pr-454 branch July 1, 2021 12:38
ArnoStiefvater pushed a commit to ArnoStiefvater/ospd-openvas that referenced this pull request Oct 25, 2021
…-2.10.2

Bump pylint from 2.9.6 to 2.10.2
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.

2 participants