Skip to content

Actions: FRRouting/frr

Actions

Add a conflict label if PR needs to rebase

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
220 workflow run results
220 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Merge pull request #14525 from LabNConsulting/chopps/mgmtd-simplify-x… Add a conflict label if PR needs to rebase #5468: Commit 448f75e pushed by idryzhov
November 8, 2023 14:30 4m 29s master
master
November 8, 2023 14:30 4m 29s
Merge pull request #14544 from idryzhov/mgmt-scratch-buffer Add a conflict label if PR needs to rebase #5467: Commit 85a80ba pushed by donaldsharp
November 8, 2023 14:18 8m 29s master
master
November 8, 2023 14:18 8m 29s
zebra: Add encap type when building packet for FPM Add a conflict label if PR needs to rebase #5466: Commit 60cff30 pushed by mergify bot
November 8, 2023 13:52 12s mergify/bp/stable/9.0/pr-14675
mergify/bp/stable/9.0/pr-14675
November 8, 2023 13:52 12s
zebra: Add encap type when building packet for FPM Add a conflict label if PR needs to rebase #5465: Commit f0f7b28 pushed by mergify bot
November 8, 2023 13:52 15s mergify/bp/stable/8.5/pr-14675
mergify/bp/stable/8.5/pr-14675
November 8, 2023 13:52 15s
mgmtd: fix local validation Add a conflict label if PR needs to rebase #5464: Commit 3d4e598 pushed by mergify bot
November 8, 2023 13:50 15s mergify/bp/dev/9.1/pr-14743
mergify/bp/dev/9.1/pr-14743
November 8, 2023 13:50 15s
mgmtd: fix local validation Add a conflict label if PR needs to rebase #5463: Commit 25b52f6 pushed by mergify bot
November 8, 2023 13:50 14s mergify/bp/stable/9.0/pr-14743
mergify/bp/stable/9.0/pr-14743
November 8, 2023 13:50 14s
Merge pull request #14743 from idryzhov/mgmtd-local-validation Add a conflict label if PR needs to rebase #5462: Commit fb9a27b pushed by donaldsharp
November 8, 2023 13:49 8m 25s master
master
November 8, 2023 13:49 8m 25s
Merge pull request #14741 from donaldsharp/zebra_h_cleanup Add a conflict label if PR needs to rebase #5461: Commit f6d708b pushed by ton31337
November 8, 2023 08:03 8m 19s master
master
November 8, 2023 08:03 8m 19s
Merge pull request #14746 from LabNConsulting/valgrind-leak-kinds Add a conflict label if PR needs to rebase #5460: Commit 4d9e220 pushed by ton31337
November 8, 2023 08:01 8m 23s master
master
November 8, 2023 08:01 8m 23s
ospfd:fix show_ip_ospf_gr_helper Add a conflict label if PR needs to rebase #5459: Pull request #14710 synchronize by teletajp
November 7, 2023 20:27 10m 12s
November 7, 2023 20:27 10m 12s
ospfd:fix show_ip_ospf_gr_helper Add a conflict label if PR needs to rebase #5458: Pull request #14710 synchronize by teletajp
November 7, 2023 20:20 12s
November 7, 2023 20:20 12s
Nhrp maintain used state Add a conflict label if PR needs to rebase #5457: Pull request #14739 synchronize by pguibert6WIND
November 7, 2023 20:16 14s
November 7, 2023 20:16 14s
bgpd: fix bgp4v2 MIB NLRI INDEX format and order Add a conflict label if PR needs to rebase #5456: Pull request #14727 synchronize by fdumontet6WIND
November 7, 2023 19:58 15s
November 7, 2023 19:58 15s
bgpd: fix bgp4v2 MIB NLRI INDEX format and order Add a conflict label if PR needs to rebase #5455: Pull request #14727 synchronize by fdumontet6WIND
November 7, 2023 19:55 16s
November 7, 2023 19:55 16s
bgpd: fix bgp4v2 MIB NLRI INDEX format and order Add a conflict label if PR needs to rebase #5454: Pull request #14727 synchronize by fdumontet6WIND
November 7, 2023 18:50 15s
November 7, 2023 18:50 15s
Merge pull request #14744 from FRRouting/mergify/bp/dev/9.1/pr-14698 Add a conflict label if PR needs to rebase #5453: Commit 92ffb92 pushed by ton31337
November 7, 2023 18:00 2m 16s dev/9.1
dev/9.1
November 7, 2023 18:00 2m 16s
zebra: Remove static ARP entries on interface down events Add a conflict label if PR needs to rebase #5452: Commit f4dca7a pushed by mergify bot
November 7, 2023 14:41 12s mergify/bp/dev/9.1/pr-14698
mergify/bp/dev/9.1/pr-14698
November 7, 2023 14:41 12s
Merge pull request #14698 from opensourcerouting/fix/remove_static_ar… Add a conflict label if PR needs to rebase #5451: Commit cf51579 pushed by riw777
November 7, 2023 14:40 8m 29s master
master
November 7, 2023 14:40 8m 29s
Nhrp maintain used state Add a conflict label if PR needs to rebase #5450: Pull request #14739 synchronize by pguibert6WIND
November 7, 2023 13:22 17s
November 7, 2023 13:22 17s
Zebra h cleanup Add a conflict label if PR needs to rebase #5449: Pull request #14741 synchronize by donaldsharp
November 7, 2023 11:48 27s
November 7, 2023 11:48 27s