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

Improve logging. (backport #862) #863

Merged
merged 3 commits into from
Sep 6, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 6, 2021

This is an automatic backport of pull request #862 done by Mergify.
Cherry-pick of 710122e has failed:

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

You are currently cherry-picking commit 710122e9.
  (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:   nasl/nasl_ssh.c

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

The function is to verbose. Now the message is logged only if the
environment variable is set.

(cherry picked from commit 710122e)

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

jjnicola commented Sep 6, 2021

@Mergifyio update

@mergify
Copy link
Contributor Author

mergify bot commented Sep 6, 2021

Command update: success

Branch has been successfully updated

@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 Sep 6, 2021
jjnicola
jjnicola previously approved these changes Sep 6, 2021
@jjnicola jjnicola merged commit aed69f3 into openvas-21.04 Sep 6, 2021
@jjnicola jjnicola deleted the mergify/bp/openvas-21.04/pr-862 branch September 6, 2021 09:43
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