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 opmode commands for firewall zones, and add global state-policies… (backport #1238) #1239

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jan 12, 2024

This is an automatic backport of pull request #1238 done by Mergify.
Cherry-pick of 85ef13b has failed:

On branch mergify/bp/sagitta/pr-1238
Your branch is up to date with 'origin/sagitta'.

You are currently cherry-picking commit 85ef13b1.
  (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:   docs/configuration/firewall/zone.rst

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   docs/quick-start.rst

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.com

… in quick-start

(cherry picked from commit 85ef13b)

# Conflicts:
#	docs/quick-start.rst
@rebortg
Copy link
Member

rebortg commented Jan 13, 2024

@nicolas-fort would you please look on the conflicts, there was a other PR i merged first. Or do we need this not anymore?

Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@rebortg rebortg closed this Mar 5, 2024
@mergify mergify bot deleted the mergify/bp/sagitta/pr-1238 branch March 5, 2024 20:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Development

Successfully merging this pull request may close these issues.

2 participants