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 auto retry on scanner connection lost during a runnning task (bp #1452) #1454

Merged
merged 12 commits into from
Mar 22, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 18, 2021

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

Cherry-pick of 3428320 has failed:

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

You are currently cherry-picking commit 3428320cf.
  (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/gvmd.c

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

Cherry-pick of 9c5893e has failed:

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

You are currently cherry-picking commit 9c5893eb1.
  (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:   src/gvmd.c

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

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/

@mergify mergify bot requested a review from a team as a code owner March 18, 2021 11:30
@mergify mergify bot added the conflicts This backport pull request has merge conflicts that need to be resolved label Mar 18, 2021
(cherry picked from commit 3428320)

# Conflicts:
#	src/manage.h
(cherry picked from commit 9c5893e)

# Conflicts:
#	src/gvmd.c
(cherry picked from commit 09c51a0)
(cherry picked from commit 5fb7f4d)
(cherry picked from commit 89b5fa9)
(cherry picked from commit d9fc966)
(cherry picked from commit 91c2e2a)
@jjnicola jjnicola added the conflicts-resolved This backport pull request had merge conflicts that have been resolved label Mar 22, 2021
@timopollmeier timopollmeier merged commit c998662 into master Mar 22, 2021
@timopollmeier timopollmeier deleted the mergify/bp/master/pr-1452 branch March 22, 2021 15:45
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 conflicts-resolved This backport pull request had merge conflicts that have been resolved
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants