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

Update doc config vrf (backport #1538) #1542

Closed
wants to merge 2 commits into from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Sep 6, 2024

Change Summary

Remove example without id. VyOS does not accept this example.
See https://forum.vyos.io/t/vrf-table-id-is-mandatory/13685

Backport

Checklist:

Remove example without id. VyOS does not accept this example.

https://forum.vyos.io/t/vrf-table-id-is-mandatory/13685
(cherry picked from commit 63fb97b)

# Conflicts:
#	docs/configuration/vrf/index.rst
added suggestion from dmbaturin

Co-authored-by: Daniil Baturin <[email protected]>
(cherry picked from commit d70a4e2)

# Conflicts:
#	docs/configuration/vrf/index.rst
@mergify mergify bot requested a review from rebortg as a code owner September 6, 2024 19:36
@mergify mergify bot added the conflicts label Sep 6, 2024
Copy link
Author

mergify bot commented Sep 6, 2024

Cherry-pick of 63fb97b has failed:

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

You are currently cherry-picking commit 63fb97b2.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   docs/configuration/vrf/index.rst

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of d70a4e2 has failed:

On branch mergify/bp/current/pr-1538
Your branch is ahead of 'origin/current' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit d70a4e22.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   docs/configuration/vrf/index.rst

no changes added to commit (use "git add" and/or "git commit -a")

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

@mergify mergify bot mentioned this pull request Sep 6, 2024
1 task
@rebortg rebortg closed this Sep 6, 2024
@mergify mergify bot deleted the mergify/bp/current/pr-1538 branch September 6, 2024 19:45
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