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
1,647 workflow run results
1,647 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

pimd: fix crash when configuring ssmpingd Add a conflict label if PR needs to rebase #6363: Commit 3f713da pushed by mergify bot
January 23, 2024 18:50 12s mergify/bp/stable/9.0/pr-15197
mergify/bp/stable/9.0/pr-15197
January 23, 2024 18:50 12s
Merge pull request #15204 from FRRouting/mergify/bp/stable/9.1/pr-15197 Add a conflict label if PR needs to rebase #6362: Commit 1a5bb43 pushed by donaldsharp
January 23, 2024 18:46 2m 15s stable/9.1
stable/9.1
January 23, 2024 18:46 2m 15s
zebra, topotests: autorise nexthop interface labelled routes Add a conflict label if PR needs to rebase #6361: Pull request #15043 synchronize by pguibert6WIND
January 23, 2024 16:48 12s
January 23, 2024 16:48 12s
zebra interfaces NB conversion Add a conflict label if PR needs to rebase #6360: Pull request #15181 synchronize by idryzhov
January 23, 2024 16:31 13s
January 23, 2024 16:31 13s
zebra interfaces NB conversion Add a conflict label if PR needs to rebase #6359: Pull request #15181 synchronize by idryzhov
January 23, 2024 16:02 14s
January 23, 2024 16:02 14s
srv6: Introduce binding-sid end.b6.encaps used by TE policy. Add a conflict label if PR needs to rebase #6358: Pull request #15170 synchronize by dmytroshytyi-6WIND
January 23, 2024 15:55 15s
January 23, 2024 15:55 15s
pimd: fix crash when configuring ssmpingd Add a conflict label if PR needs to rebase #6357: Commit c278b55 pushed by mergify bot
January 23, 2024 15:39 12s mergify/bp/stable/9.1/pr-15197
mergify/bp/stable/9.1/pr-15197
January 23, 2024 15:39 12s
Merge pull request #15197 from idryzhov/pim-nb-fix Add a conflict label if PR needs to rebase #6356: Commit edd4a85 pushed by donaldsharp
January 23, 2024 15:37 10m 23s master
master
January 23, 2024 15:37 10m 23s
Merge pull request #15199 from FRRouting/mergify/bp/stable/9.0/pr-15193 Add a conflict label if PR needs to rebase #6355: Commit c5f7024 pushed by donaldsharp
January 23, 2024 15:37 2m 14s stable/9.0
stable/9.0
January 23, 2024 15:37 2m 14s
Merge pull request #15198 from FRRouting/mergify/bp/stable/9.1/pr-15193 Add a conflict label if PR needs to rebase #6354: Commit 3723c05 pushed by donaldsharp
January 23, 2024 15:36 2m 13s stable/9.1
stable/9.1
January 23, 2024 15:36 2m 13s
Merge pull request #15165 from vjardin/ospf_ptmp_unumbered Add a conflict label if PR needs to rebase #6353: Commit 3ab8fc1 pushed by ton31337
January 23, 2024 15:22 8m 24s master
master
January 23, 2024 15:22 8m 24s
Merge pull request #15195 from idryzhov/vtysh-vrf-fix Add a conflict label if PR needs to rebase #6352: Commit 5435d96 pushed by ton31337
January 23, 2024 15:20 10m 29s master
master
January 23, 2024 15:20 10m 29s
bgpd: fix RPKI coverity scanner issues Add a conflict label if PR needs to rebase #6351: Pull request #15201 synchronize by louis-6wind
January 23, 2024 12:13 13s
January 23, 2024 12:13 13s
bgpd: fix RPKI coverity scanner issues Add a conflict label if PR needs to rebase #6350: Pull request #15201 synchronize by louis-6wind
January 23, 2024 11:05 13s
January 23, 2024 11:05 13s
lib: remove leaf-list xpath hack from northbound Add a conflict label if PR needs to rebase #6349: Pull request #15196 synchronize by idryzhov
January 23, 2024 10:33 14s
January 23, 2024 10:33 14s
pimd: fix crash when configuring ssmpingd Add a conflict label if PR needs to rebase #6348: Pull request #15197 synchronize by idryzhov
January 23, 2024 10:00 16s
January 23, 2024 10:00 16s
srv6: Introduce binding-sid end.b6.encaps used by TE policy. Add a conflict label if PR needs to rebase #6347: Pull request #15170 synchronize by dmytroshytyi-6WIND
January 23, 2024 09:44 15s
January 23, 2024 09:44 15s
Merge pull request #15179 from donaldsharp/zebra_neigh_update Add a conflict label if PR needs to rebase #6346: Commit 92a56d2 pushed by ton31337
January 23, 2024 06:51 2m 20s master
master
January 23, 2024 06:51 2m 20s
bgpd: fix route-map match probability deconfiguration callback Add a conflict label if PR needs to rebase #6345: Commit 96b7e5a pushed by mergify bot
January 23, 2024 06:50 11s mergify/bp/stable/9.0/pr-15193
mergify/bp/stable/9.0/pr-15193
January 23, 2024 06:50 11s
bgpd: fix route-map match probability deconfiguration callback Add a conflict label if PR needs to rebase #6344: Commit b8fb7fe pushed by mergify bot
January 23, 2024 06:50 12s mergify/bp/stable/9.1/pr-15193
mergify/bp/stable/9.1/pr-15193
January 23, 2024 06:50 12s
Merge pull request #15193 from idryzhov/fix-bgp-rmap-probability Add a conflict label if PR needs to rebase #6343: Commit b27f4e2 pushed by ton31337
January 23, 2024 06:49 4m 23s master
master
January 23, 2024 06:49 4m 23s
Merge pull request #15194 from idryzhov/dist-list-fixes Add a conflict label if PR needs to rebase #6342: Commit 296cda5 pushed by choppsv1
January 23, 2024 01:44 4m 24s master
master
January 23, 2024 01:44 4m 24s
distribute-list fixes and improvements Add a conflict label if PR needs to rebase #6341: Pull request #15194 synchronize by idryzhov
January 22, 2024 21:59 15s
January 22, 2024 21:59 15s
bgpd: add [no]neighbor capability fqdn Add a conflict label if PR needs to rebase #6340: Pull request #15192 synchronize by fdumontet6WIND
January 22, 2024 20:28 15s
January 22, 2024 20:28 15s
zebra: avoid having speed set to UINT32_MAX Add a conflict label if PR needs to rebase #6339: Pull request #10151 synchronize by pguibert6WIND
January 22, 2024 17:20 15s
January 22, 2024 17:20 15s
ProTip! You can narrow down the results and go further in time using created:<2024-01-22 or the other filters available.