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 host from the orignal hosts list when boreas is enabled (backport #725) #727

Merged
merged 3 commits into from
May 4, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 4, 2021

This is an automatic backport of pull request #725 done by Mergify.
Cherry-pick of 60c9777 has failed:

On branch mergify/bp/openvas-20.08/pr-725
Your branch is up to date with 'origin/openvas-20.08'.

You are currently cherry-picking commit 60c9777f.
  (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
	both modified:   src/attack.c

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/

When boreas is enabled, a new host element is created with only the IP address,
while the hostname was lost during the alive detection.

(cherry picked from commit 60c9777)

# Conflicts:
#	CHANGELOG.md
#	src/attack.c
@mergify mergify bot added the conflicts This backport pull request has merge conflicts that need to be resolved label May 4, 2021
@ArnoStiefvater
Copy link
Member

@Mergifyio refresh

@mergify
Copy link
Contributor Author

mergify bot commented May 4, 2021

Command refresh: success

Pull request refreshed

@jjnicola jjnicola 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 May 4, 2021
@jjnicola jjnicola merged commit e37a65e into openvas-20.08 May 4, 2021
@jjnicola jjnicola deleted the mergify/bp/openvas-20.08/pr-725 branch May 4, 2021 14:26
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.

2 participants