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

Add function to find and return a host from a host list. (backport #490) #494

Merged
merged 2 commits into from
May 4, 2021

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented May 4, 2021

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

On branch mergify/bp/gvm-libs-20.08/pr-490
Your branch is up to date with 'origin/gvm-libs-20.08'.

You are currently cherry-picking commit e863f7d.
  (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:   base/hosts.c
	modified:   base/hosts.h

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://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/

(cherry picked from commit e863f7d)

# Conflicts:
#	CHANGELOG.md
@mergify mergify bot requested a review from a team as a code owner May 4, 2021 13:53
@mergify mergify bot added the conflicts This backport pull request has merge conflicts that need to be resolved label May 4, 2021
@jjnicola
Copy link
Member

jjnicola commented May 4, 2021

@Mergifyio refresh

@mergify
Copy link
Author

mergify bot commented May 4, 2021

Command refresh: success

Pull request refreshed

@ArnoStiefvater ArnoStiefvater merged commit c00d02a into gvm-libs-20.08 May 4, 2021
@mergify mergify bot deleted the mergify/bp/gvm-libs-20.08/pr-490 branch May 4, 2021 14:20
@jjnicola jjnicola added conflicts solved This backport pull request had conflicts which have been solved and removed conflicts This backport pull request has merge conflicts that need to be resolved labels May 4, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
conflicts solved This backport pull request had conflicts which have been solved
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants