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

T5729: firewall: switch to valueless in (backport #2471) #2477

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 13, 2023

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

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

You are currently cherry-picking commit c4409d6a4.
  (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:   interface-definitions/include/firewall/log.xml.i
	new file:   interface-definitions/include/firewall/state.xml.i
	modified:   interface-definitions/include/nat-rule.xml.i
	modified:   interface-definitions/include/policy/route-common.xml.i
	modified:   interface-definitions/include/version/firewall-version.xml.i
	modified:   interface-definitions/include/version/policy-version.xml.i
	modified:   interface-definitions/nat66.xml.in
	modified:   smoketest/scripts/cli/test_policy_route.py
	modified:   src/conf_mode/firewall.py
	modified:   src/migration-scripts/firewall/11-to-12
	new file:   src/migration-scripts/firewall/12-to-13
	new file:   src/migration-scripts/policy/6-to-7

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   interface-definitions/include/firewall/common-rule-bridge.xml.i
	both modified:   interface-definitions/include/firewall/common-rule-inet.xml.i
	both modified:   python/vyos/firewall.py
	both modified:   smoketest/scripts/cli/test_firewall.py

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

…enable|disable> commands; log and state moved to new syntax.

(cherry picked from commit c4409d6)

# Conflicts:
#	interface-definitions/include/firewall/common-rule-bridge.xml.i
#	interface-definitions/include/firewall/common-rule-inet.xml.i
#	python/vyos/firewall.py
#	smoketest/scripts/cli/test_firewall.py
@mergify mergify bot added the conflicts label Nov 13, 2023
@mergify mergify bot mentioned this pull request Nov 13, 2023
12 tasks
@github-actions github-actions bot added the sagitta VyOS 1.4 LTS label Nov 13, 2023
@vyosbot vyosbot requested review from a team, dmbaturin, sarthurdev, zdc, jestabro, sever-sever and c-po and removed request for a team November 13, 2023 12:00
@c-po
Copy link
Member

c-po commented Nov 13, 2023

@nicolas-fort will provide a manual backport

@c-po c-po closed this Nov 13, 2023
@mergify mergify bot deleted the mergify/bp/sagitta/pr-2471 branch November 13, 2023 12:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Development

Successfully merging this pull request may close these issues.

2 participants