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

lib, zebra: Keep zebra on-rib-process script in frr.conf (backport #17160) #17261

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Oct 27, 2024

Closes #17161


This is an automatic backport of pull request #17160 done by Mergify.

After the change:

```
$ grep on-rib-process /etc/frr/frr.conf
zebra on-rib-process script script4

$ systemctl restart frr

$ vtysh -c 'show run' | grep on-rib-process
zebra on-rib-process script script4
```

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
(cherry picked from commit 1fe1f8d)

# Conflicts:
#	lib/frrscript.c
@mergify mergify bot added the conflicts label Oct 27, 2024
Copy link
Author

mergify bot commented Oct 27, 2024

Cherry-pick of 1fe1f8d has failed:

On branch mergify/bp/stable/9.1/pr-17160
Your branch is up to date with 'origin/stable/9.1'.

You are currently cherry-picking commit 1fe1f8d87c.
  (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:   lib/frrscript.h
	modified:   zebra/zebra_vty.c

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   lib/frrscript.c

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

@ton31337
Copy link
Member

Created a manual backport here #17263, closing this.

@ton31337 ton31337 closed this Oct 28, 2024
@ton31337 ton31337 deleted the mergify/bp/stable/9.1/pr-17160 branch October 28, 2024 07:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant