Skip to content

Actions: donaldsharp/frr

Actions

Add a conflict label is PR needs to rebase

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
337 workflow runs
337 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

bgpd: Fix wrong pthread event cancelling Add a conflict label is PR needs to rebase #741: Commit d487f9e pushed by donaldsharp
November 1, 2024 15:35 2s backport_17229_8.5
backport_17229_8.5
November 1, 2024 15:35 2s
bgpd: Remove bgp_path_info_mpath_dequeue Add a conflict label is PR needs to rebase #740: Commit 02c4e93 pushed by donaldsharp
October 22, 2024 14:52 3s backport_mpath_8.5
backport_mpath_8.5
October 22, 2024 14:52 3s
zebra: Prevent starvation in dplane_thread_loop Add a conflict label is PR needs to rebase #739: Commit 0c05241 pushed by donaldsharp
October 11, 2024 19:29 2s fpm_backpressure_8.5
fpm_backpressure_8.5
October 11, 2024 19:29 2s
zebra: Modify show zebra dplane providers to give more data Add a conflict label is PR needs to rebase #738: Commit 82267fe pushed by donaldsharp
June 18, 2024 20:17 2s frr-8.5.4_backport_zebra_fpm_backpressure
frr-8.5.4_backport_zebra_fpm_backpressure
June 18, 2024 20:17 2s
zebra: Limit queue depth in dplane_fpm_nl Add a conflict label is PR needs to rebase #737: Commit d41ca8a pushed by donaldsharp
June 13, 2024 15:55 2s frr-8.5.4_backport_zebra_fpm_backpressure
frr-8.5.4_backport_zebra_fpm_backpressure
June 13, 2024 15:55 2s
lib: Discourage usage of deprecated data structures Add a conflict label is PR needs to rebase #736: Commit fe4e184 pushed by donaldsharp
May 31, 2024 16:09 2s linklist_discouragement
linklist_discouragement
May 31, 2024 16:09 2s
pimd: Give a clearer warning when the kernel is not compiled right Add a conflict label is PR needs to rebase #735: Commit 5ef144c pushed by donaldsharp
May 31, 2024 15:30 2s mroute_error
mroute_error
May 31, 2024 15:30 2s
ospf6d: Prevent heap-buffer-overflow with unknown type Add a conflict label is PR needs to rebase #734: Commit 826f251 pushed by donaldsharp
May 30, 2024 12:03 3s ospfv3_read_after
ospfv3_read_after
May 30, 2024 12:03 3s
tests: Fix zebra_seg6_route Add a conflict label is PR needs to rebase #733: Commit f766686 pushed by donaldsharp
May 29, 2024 18:53 2s seg6_topotest_fix
seg6_topotest_fix
May 29, 2024 18:53 2s
lib: Thread is being used and set at the same time Add a conflict label is PR needs to rebase #732: Commit 3ec469c pushed by donaldsharp
May 24, 2024 19:25 2s memories_i_love_you
memories_i_love_you
May 24, 2024 19:25 2s
zebra: Fix misaligned long long unsigned int Add a conflict label is PR needs to rebase #731: Commit cfb538c pushed by donaldsharp
May 23, 2024 12:25 2s memories_i_love_you
memories_i_love_you
May 23, 2024 12:25 2s
doc: Add missing show ip route summ command Add a conflict label is PR needs to rebase #730: Commit d284e22 pushed by donaldsharp
May 20, 2024 19:46 2s show_ip_route_summary
show_ip_route_summary
May 20, 2024 19:46 2s
FIX BORKED UP backport Add a conflict label is PR needs to rebase #729: Commit 089746a pushed by donaldsharp
May 15, 2024 16:22 3s frr-8.5.1_backport_backpressure
frr-8.5.1_backport_backpressure
May 15, 2024 16:22 3s
*: Modify agentx to be allowed to be called Add a conflict label is PR needs to rebase #728: Commit 73ad64a pushed by donaldsharp
May 10, 2024 14:37 2s agentx_update
agentx_update
May 10, 2024 14:37 2s
zebra: Ensure multipath encodes vxlan right for fpm usage Add a conflict label is PR needs to rebase #727: Commit c7a3f82 pushed by donaldsharp
May 9, 2024 15:57 2s 8.5_parse_rtattrs
8.5_parse_rtattrs
May 9, 2024 15:57 2s
zebra: Ensure multipath encodes vxlan right for fpm usage Add a conflict label is PR needs to rebase #726: Commit bd4fca1 pushed by donaldsharp
May 9, 2024 15:52 3s parse_attr_problems
parse_attr_problems
May 9, 2024 15:52 3s
*: Modify agentx to be allowed to be called Add a conflict label is PR needs to rebase #725: Commit 300ca69 pushed by donaldsharp
May 9, 2024 11:57 3s agentx_update
agentx_update
May 9, 2024 11:57 3s
*: Modify agentx to be allowed to be called Add a conflict label is PR needs to rebase #724: Commit 88d3912 pushed by donaldsharp
May 9, 2024 11:49 2s agentx_update
agentx_update
May 9, 2024 11:49 2s
zebra: Ensure multipath encodes vxlan right for fpm usage Add a conflict label is PR needs to rebase #723: Commit 058b272 pushed by donaldsharp
May 8, 2024 17:33 2s parse_attr_problems
parse_attr_problems
May 8, 2024 17:33 2s
zebra: Ensure multipath encodes vxlan right for fpm usage Add a conflict label is PR needs to rebase #722: Commit e81eeea pushed by donaldsharp
May 8, 2024 16:57 2s parse_attr_problems
parse_attr_problems
May 8, 2024 16:57 2s
zebra: Ensure proper decoding of netlink message Add a conflict label is PR needs to rebase #721: Commit 26595e3 pushed by donaldsharp
April 30, 2024 18:55 2s parse_attr_problems
parse_attr_problems
April 30, 2024 18:55 2s
lib, zebra: Check for not being a blackhole route Add a conflict label is PR needs to rebase #720: Commit 3d2a8d8 pushed by donaldsharp
April 26, 2024 17:52 2s frr-8.5.4_backport_nhg_check
frr-8.5.4_backport_nhg_check
April 26, 2024 17:52 2s
pimd: fix crash unconfiguring rp keepalive timer Add a conflict label is PR needs to rebase #719: Commit 0c4b7c1 pushed by donaldsharp
April 26, 2024 14:14 3s pim_crash_dnode
pim_crash_dnode
April 26, 2024 14:14 3s
bgpd: Remove unused addition found in clang Add a conflict label is PR needs to rebase #718: Commit b4c64b3 pushed by donaldsharp
April 25, 2024 18:45 2s sa_clang_15_some_problems
sa_clang_15_some_problems
April 25, 2024 18:45 2s
bgpd: Explain Better admin w/ redistribution a bit better. Add a conflict label is PR needs to rebase #717: Commit 6214396 pushed by donaldsharp
April 25, 2024 18:18 2s redistibute_doc_change
redistibute_doc_change
April 25, 2024 18:18 2s