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

Configuration Blueprints: add new example for firewall+vrf. (backport #1482) #1485

Merged
merged 2 commits into from
Jun 18, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jun 18, 2024

Change Summary

Configuration Blueprints: add new example for firewall+vrf. Also add note about usage of inbound and outbound interface when interface is attached to a non-default vrf.

Related Task(s)

Related PR(s)

Backport

Valid also for Sagitta

Checklist:

… note about usage of inbound and outbound interface when interface is attached to a non-default vrf.

(cherry picked from commit fe416b5)

# Conflicts:
#	docs/configexamples/zone-policy.rst
@mergify mergify bot requested a review from rebortg as a code owner June 18, 2024 19:32
@mergify mergify bot added the conflicts label Jun 18, 2024
Copy link
Author

mergify bot commented Jun 18, 2024

Cherry-pick of fe416b5 has failed:

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

You are currently cherry-picking commit fe416b56.
  (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:
	new file:   docs/_static/images/firewall-and-vrf-blueprints.png
	new file:   docs/configexamples/firewall.rst
	new file:   docs/configexamples/fwall-and-vrf.rst
	modified:   docs/configexamples/index.rst
	modified:   docs/configuration/firewall/ipv4.rst
	modified:   docs/configuration/firewall/ipv6.rst

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

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@rebortg rebortg removed the conflicts label Jun 18, 2024
@rebortg rebortg merged commit 6c1bf92 into sagitta Jun 18, 2024
3 of 4 checks passed
@mergify mergify bot deleted the mergify/bp/sagitta/pr-1482 branch June 18, 2024 19:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

2 participants