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

ospf6d: fix argument processing in the "area ... range" command (backport #9108) #9296

Merged
merged 2 commits into from
Aug 5, 2021

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Aug 4, 2021

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

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

You are currently cherry-picking commit b9ff9be45.
  (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:   doc/user/ospf6d.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/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.io/

* When the "cost" argument isn't present, the default cost should be
  used instead of preserving the previously configured one (if any);
* When the "not-advertise" argument isn't present, the "not-advertise"
  flag should be unset regardless if it was previously configured or
  not.

Configuration commands should be deterministic and work in the same
way regardless of the current state.

Signed-off-by: Renato Westphal <[email protected]>
(cherry picked from commit 848db95)
Signed-off-by: Renato Westphal <[email protected]>
(cherry picked from commit b9ff9be)
@idryzhov idryzhov force-pushed the mergify/bp/stable/8.0/pr-9108 branch from 1339fdf to 92c61a3 Compare August 4, 2021 14:59
@idryzhov idryzhov removed the conflicts label Aug 4, 2021
@LabN-CI
Copy link
Collaborator

LabN-CI commented Aug 4, 2021

💚 Basic BGPD CI results: SUCCESS, 0 tests failed

Results table
_ _
Result SUCCESS git merge/9296 92c61a3
Date 08/04/2021
Start 12:10:26
Finish 12:36:03
Run-Time 25:37
Total 1813
Pass 1813
Fail 0
Valgrind-Errors
Valgrind-Loss
Details vncregress-2021-08-04-12:10:26.txt
Log autoscript-2021-08-04-12:11:37.log.bz2
Memory 516 481 423

For details, please contact louberger

@NetDEF-CI
Copy link
Collaborator

NetDEF-CI commented Aug 4, 2021

Continuous Integration Result: SUCCESSFUL

Continuous Integration Result: SUCCESSFUL

Congratulations, this patch passed basic tests

Tested-by: NetDEF / OpenSourceRouting.org CI System

CI System Testrun URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20802/

This is a comment from an automated CI system.
For questions and feedback in regards to this CI system, please feel free to email
Martin Winter - mwinter (at) opensourcerouting.org.

@NetDEF-CI
Copy link
Collaborator

Continuous Integration Result: SUCCESSFUL

Congratulations, this patch passed basic tests

Tested-by: NetDEF / OpenSourceRouting.org CI System

CI System Testrun URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20805/

This is a comment from an automated CI system.
For questions and feedback in regards to this CI system, please feel free to email
Martin Winter - mwinter (at) opensourcerouting.org.

@donaldsharp donaldsharp merged commit a488828 into stable/8.0 Aug 5, 2021
@mergify mergify bot deleted the mergify/bp/stable/8.0/pr-9108 branch August 5, 2021 21:02
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.

6 participants