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

Fix potential segfault (backport #884) #892

Merged
merged 2 commits into from Oct 11, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 11, 2021

This is an automatic backport of pull request #884 done by Mergify.
Cherry-pick of ebc56f8 has failed:

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

You are currently cherry-picking commit ebc56f8d.
  (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://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/

@mergify mergify bot requested a review from a team as a code owner October 11, 2021 09:27
@mergify mergify bot added the conflicts This backport pull request has merge conflicts that need to be resolved label Oct 11, 2021
ArnoStiefvater
ArnoStiefvater previously approved these changes Oct 11, 2021
(cherry picked from commit da923e4)
(cherry picked from commit ebc56f8)

# Conflicts:
#	CHANGELOG.md
@y0urself y0urself added conflicts-resolved Conflicts in this pull request were solved and removed conflicts This backport pull request has merge conflicts that need to be resolved labels Oct 11, 2021
@ArnoStiefvater ArnoStiefvater merged commit 173c514 into openvas-20.08 Oct 11, 2021
@ArnoStiefvater ArnoStiefvater deleted the mergify/bp/openvas-20.08/pr-884 branch October 11, 2021 15:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
conflicts-resolved Conflicts in this pull request were solved
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants