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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

topotests: convert to exabgp 4 and python3 Add a conflict label if PR needs to rebase #5968: Pull request #14890 synchronize by louis-6wind
December 14, 2023 10:44 18s
December 14, 2023 10:44 18s
topotests: convert to exabgp 4 and python3 Add a conflict label if PR needs to rebase #5967: Pull request #14890 synchronize by louis-6wind
December 14, 2023 09:58 14s
December 14, 2023 09:58 14s
ospfd: OSPFv2 support for draft-ietf-lsr-flex-algo Add a conflict label if PR needs to rebase #5966: Pull request #11849 synchronize by pushpasis
December 14, 2023 09:45 17s
December 14, 2023 09:45 17s
doc: add param range for graceful-restart helper supported-grace-time Add a conflict label if PR needs to rebase #5965: Commit 8e72195 pushed by mergify bot
December 14, 2023 05:42 13s mergify/bp/stable/8.5/pr-15014
mergify/bp/stable/8.5/pr-15014
December 14, 2023 05:42 13s
doc: add param range for graceful-restart helper supported-grace-time Add a conflict label if PR needs to rebase #5964: Commit 3bc9880 pushed by mergify bot
December 14, 2023 05:42 10s mergify/bp/stable/9.0/pr-15014
mergify/bp/stable/9.0/pr-15014
December 14, 2023 05:42 10s
doc: add param range for graceful-restart helper supported-grace-time Add a conflict label if PR needs to rebase #5963: Commit b72afd7 pushed by mergify bot
December 14, 2023 05:42 10s mergify/bp/stable/9.1/pr-15014
mergify/bp/stable/9.1/pr-15014
December 14, 2023 05:42 10s
Merge pull request #15014 from Shbinging/fix_ospf_commands Add a conflict label if PR needs to rebase #5962: Commit 5e87eae pushed by ton31337
December 14, 2023 05:40 6m 18s master
master
December 14, 2023 05:40 6m 18s
zebra: Don't leak memory in rtadv.c code on shutdown Add a conflict label if PR needs to rebase #5961: Commit 4b3b69a pushed by mergify bot
December 14, 2023 05:39 10s mergify/bp/stable/9.0/pr-14996
mergify/bp/stable/9.0/pr-14996
December 14, 2023 05:39 10s
zebra: Don't leak memory in rtadv.c code on shutdown Add a conflict label if PR needs to rebase #5960: Commit 75e990c pushed by mergify bot
December 14, 2023 05:38 11s mergify/bp/stable/9.1/pr-14996
mergify/bp/stable/9.1/pr-14996
December 14, 2023 05:38 11s
Merge pull request #14996 from donaldsharp/srv6_shutdown_zebra_deletion Add a conflict label if PR needs to rebase #5959: Commit 5bdf2e5 pushed by ton31337
December 14, 2023 05:38 10m 27s master
master
December 14, 2023 05:38 10m 27s
oper state Add a conflict label if PR needs to rebase #5958: Pull request #14492 synchronize by choppsv1
December 14, 2023 02:09 15s
December 14, 2023 02:09 15s
Merge pull request #15013 from opensourcerouting/fix/bdb5ae8bce94432e… Add a conflict label if PR needs to rebase #5957: Commit 2cefe5d pushed by mjstapp
December 13, 2023 21:19 2m 13s stable/9.0
stable/9.0
December 13, 2023 21:19 2m 13s
BGP backup route Add a conflict label if PR needs to rebase #5956: Pull request #13842 synchronize by pguibert6WIND
December 13, 2023 16:07 14s
December 13, 2023 16:07 14s
Nhrp maintain used state Add a conflict label if PR needs to rebase #5955: Pull request #14739 synchronize by pguibert6WIND
December 13, 2023 16:06 20s
December 13, 2023 16:06 20s
Zebra nexthop rework Add a conflict label if PR needs to rebase #5954: Pull request #15001 synchronize by pguibert6WIND
December 13, 2023 16:05 19s
December 13, 2023 16:05 19s
ospf6d: rework ospf6 neighbor state display Add a conflict label if PR needs to rebase #5953: Pull request #14912 synchronize by fdumontet6WIND
December 13, 2023 15:56 15s
December 13, 2023 15:56 15s
ospf6d: rework ospf6 neighbor state display Add a conflict label if PR needs to rebase #5952: Pull request #14912 synchronize by fdumontet6WIND
December 13, 2023 15:41 15s
December 13, 2023 15:41 15s
zebra: Fix crash on macvlan link down/up Add a conflict label if PR needs to rebase #5951: Pull request #15010 synchronize by tlsalmin
December 13, 2023 09:49 16s
December 13, 2023 09:49 16s
tools: fix frr-reload multiple no description cmds Add a conflict label if PR needs to rebase #5950: Commit 5a35e86 pushed by mergify bot
December 13, 2023 08:30 10s mergify/bp/stable/9.0/pr-15004
mergify/bp/stable/9.0/pr-15004
December 13, 2023 08:30 10s
tools: fix frr-reload multiple no description cmds Add a conflict label if PR needs to rebase #5949: Commit 304f908 pushed by mergify bot
December 13, 2023 08:30 11s mergify/bp/stable/9.1/pr-15004
mergify/bp/stable/9.1/pr-15004
December 13, 2023 08:30 11s
Merge pull request #15004 from chiragshah6/mdev1 Add a conflict label if PR needs to rebase #5948: Commit ec1e9f4 pushed by ton31337
December 13, 2023 08:28 8m 23s master
master
December 13, 2023 08:28 8m 23s
Merge pull request #15003 from donaldsharp/vrf_all_data Add a conflict label if PR needs to rebase #5947: Commit 4d0a0b3 pushed by ton31337
December 13, 2023 07:27 8m 25s master
master
December 13, 2023 07:27 8m 25s
ospfd: OSPFv2 support for draft-ietf-lsr-flex-algo Add a conflict label if PR needs to rebase #5946: Pull request #11849 synchronize by pushpasis
December 13, 2023 07:03 17s
December 13, 2023 07:03 17s
tools: fix frr-reload multiple no description cmds Add a conflict label if PR needs to rebase #5945: Pull request #15004 synchronize by chiragshah6
December 13, 2023 01:47 12s
December 13, 2023 01:47 12s
Merge pull request #14999 from FRRouting/mergify/bp/stable/9.1/pr-14982 Add a conflict label if PR needs to rebase #5944: Commit fb07a9c pushed by donaldsharp
December 12, 2023 23:22 13s stable/9.1
stable/9.1
December 12, 2023 23:22 13s