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

Improve modify_override errors, fix no NVT case (bp #1435) #1437

Merged
merged 3 commits into from
Mar 8, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 8, 2021

This is an automatic backport of pull request #1435 done by Mergify.

Cherry-pick of 99918c4 has failed:

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

You are currently cherry-picking commit 99918c446.
  (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:   src/gmp.c

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/manage_sql.c

To fixup this pull request, you can check out it 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/

The command will now return relevant syntax errors if the threat or
severity elements are invalid or required ones are missing.
Also, the case where no NVT OID is given has been fixed.

(cherry picked from commit 99918c4)

# Conflicts:
#	src/manage_sql.c
@mergify mergify bot requested a review from a team as a code owner March 8, 2021 12:13
@mergify mergify bot added the conflicts This backport pull request has merge conflicts that need to be resolved label Mar 8, 2021
The conflict in the modify_override improvement was due to the "Debug"
severity level being removed.
@bjoernricks bjoernricks merged commit f944951 into master Mar 8, 2021
@bjoernricks bjoernricks deleted the mergify/bp/master/pr-1435 branch March 8, 2021 15:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
conflicts This backport pull request has merge conflicts that need to be resolved
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants