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

yang: add missing zif-gre zebra interface type (backport #15803) #15807

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Apr 20, 2024

This was caught by the grpc_basic test which was receiving an invalid error result, which was returned b/c inside zebra the libyang code was flagging the value as invalid for a derived zebra interface type.


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

This was caught by the grpc_basic test which was receiving an invalid error
result, which was returned b/c inside zebra the libyang code was flagging the
value as invalid for a derived zebra interface type.

Signed-off-by: Christian Hopps <chopps@labn.net>
(cherry picked from commit 74fb405)

# Conflicts:
#	zebra/zebra_nb_state.c
@mergify mergify bot added the conflicts label Apr 20, 2024
Copy link
Author

mergify bot commented Apr 20, 2024

Cherry-pick of 74fb405 has failed:

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

You are currently cherry-picking commit 74fb4056c.
  (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:   yang/frr-zebra.yang

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   zebra/zebra_nb_state.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

@frrbot frrbot bot added the yang label Apr 20, 2024
@idryzhov idryzhov closed this Apr 20, 2024
@mergify mergify bot deleted the mergify/bp/stable/10.0/pr-15803 branch April 20, 2024 18:52
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.

2 participants