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

Updated function description of nasl_ssh_shell_read() (backport #755) #773

Merged
merged 3 commits into from
Jun 22, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 22, 2021

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

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

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

# Conflicts:
#	CHANGELOG.md
@mergify mergify bot requested a review from a team as a code owner June 22, 2021 06:33
@mergify mergify bot added the conflicts This backport pull request has merge conflicts that need to be resolved label Jun 22, 2021
@ArnoStiefvater ArnoStiefvater removed the conflicts This backport pull request has merge conflicts that need to be resolved label Jun 22, 2021
@ArnoStiefvater ArnoStiefvater merged commit 78bef49 into openvas-21.04 Jun 22, 2021
@mergify mergify bot deleted the mergify/bp/openvas-21.04/pr-755 branch June 22, 2021 09:25
ArnoStiefvater added a commit that referenced this pull request Jun 22, 2021
Updated function description of nasl_ssh_shell_read() (backport #755) (backport #773)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants