Skip to content

Actions: donaldsharp/frr

Actions

Add a conflict label if PR needs to rebase

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
40 workflow run results
40 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

opsfclient: Convert to use getaddrinfo Add a conflict label if PR needs to rebase #527: Commit 66d1f52 pushed by donaldsharp
November 23, 2023 23:41 2s getaddrinfo
getaddrinfo
November 23, 2023 23:41 2s
opsfclient: Convert to use getaddrinfo Add a conflict label if PR needs to rebase #526: Commit 55147c2 pushed by donaldsharp
November 23, 2023 23:21 2s getaddrinfo
getaddrinfo
November 23, 2023 23:21 2s
zebra: Cleanup zrouter.stale_client_list on shutdown Add a conflict label if PR needs to rebase #525: Commit 71f7ecb pushed by donaldsharp
November 21, 2023 17:41 2s zebra_final_shutdown_finally
zebra_final_shutdown_finally
November 21, 2023 17:41 2s
bgpd: Ignore handling NLRIs if we received MP_UNREACH_NLRI Add a conflict label if PR needs to rebase #524: Commit a0c4ec2 pushed by donaldsharp
November 21, 2023 14:45 2s backport_itis
backport_itis
November 21, 2023 14:45 2s
*: Let's use the native IFNAMSIZ instead of INTERFACE_NAMSIZ Add a conflict label if PR needs to rebase #523: Commit 07b91ca pushed by donaldsharp
November 21, 2023 13:09 2s IFNAMSIZ_GET_YOUR_SHIT_TOGETHER
IFNAMSIZ_GET_YOUR_SHIT_TOGETHER
November 21, 2023 13:09 2s
zebra: Cleanup zrouter.stale_client_list on shutdown Add a conflict label if PR needs to rebase #522: Commit 49bbbd7 pushed by donaldsharp
November 20, 2023 20:41 3s zebra_final_shutdown_finally
zebra_final_shutdown_finally
November 20, 2023 20:41 3s
zebra: Fix non-notification of better admin won Add a conflict label if PR needs to rebase #521: Commit f12783b pushed by donaldsharp
November 20, 2023 15:52 3s zebra_notify_admin_lost
zebra_notify_admin_lost
November 20, 2023 15:52 3s
zebra: Fix fpm multipath encap addition Add a conflict label if PR needs to rebase #520: Commit 6b23ece pushed by donaldsharp
November 20, 2023 14:48 3s multipath_evpn_encap_attr
multipath_evpn_encap_attr
November 20, 2023 14:48 3s
TESTt Add a conflict label if PR needs to rebase #519: Commit d7b234b pushed by donaldsharp
November 17, 2023 21:57 2s encap_all_the_way_down
encap_all_the_way_down
November 17, 2023 21:57 2s
zebra: On shutdown, ensure ctx's in rib_dplane_q are freed Add a conflict label if PR needs to rebase #518: Commit b0e588d pushed by donaldsharp
November 16, 2023 17:57 3s zebra_final_shutdown_finally
zebra_final_shutdown_finally
November 16, 2023 17:57 3s
lib: Prevent infinite loop in ospf Add a conflict label if PR needs to rebase #517: Commit 1c0f3b6 pushed by donaldsharp
November 14, 2023 17:02 2s ospf_bsd_double_whammy_no_whammy
ospf_bsd_double_whammy_no_whammy
November 14, 2023 17:02 2s
lib: Prevent infinite loop in ospf Add a conflict label if PR needs to rebase #516: Commit 3c5a937 pushed by donaldsharp
November 14, 2023 16:33 4s ospf_bsd_double_whammy_no_whammy
ospf_bsd_double_whammy_no_whammy
November 14, 2023 16:33 4s
zebra: Fix non-notification of better admin won Add a conflict label if PR needs to rebase #515: Commit 582740b pushed by donaldsharp
November 14, 2023 15:22 3s zebra_notify_admin_lost
zebra_notify_admin_lost
November 14, 2023 15:22 3s
bgpd: Used %pBD instead of %pRN Add a conflict label if PR needs to rebase #514: Commit 12deca0 pushed by donaldsharp
November 13, 2023 15:28 3s pbd
pbd
November 13, 2023 15:28 3s
tests: Remove log monitor XX it's not a cli command Add a conflict label if PR needs to rebase #513: Commit 3edeaa9 pushed by donaldsharp
November 13, 2023 14:17 3s frr_memory_leaks_cleanup
frr_memory_leaks_cleanup
November 13, 2023 14:17 3s
POSSIBLE FIX for ecmp problem being seen Add a conflict label if PR needs to rebase #512: Commit b8b81d4 pushed by donaldsharp
November 10, 2023 17:18 3s possible_ecmp_fix
possible_ecmp_fix
November 10, 2023 17:18 3s
lib: Modify event system to treat fd access more fairly Add a conflict label if PR needs to rebase #511: Commit 57ea8ac pushed by donaldsharp
November 8, 2023 20:33 3s event_io_smoothing
event_io_smoothing
November 8, 2023 20:33 3s
doc: Add the documentation for the new evpn command Add a conflict label if PR needs to rebase #510: Commit 75e501a pushed by donaldsharp
November 8, 2023 17:59 3s evpn_zebra_stuff
evpn_zebra_stuff
November 8, 2023 17:59 3s
*: Move distance related defines into their own header Add a conflict label if PR needs to rebase #509: Commit 6de9f7f pushed by donaldsharp
November 7, 2023 11:48 3s zebra_h_cleanup
zebra_h_cleanup
November 7, 2023 11:48 3s
bgpd: Ensure BGP does not stop monitoring nexthops Add a conflict label if PR needs to rebase #508: Commit ac795e8 pushed by donaldsharp
November 6, 2023 18:06 3s bgp_unregister_stop
bgp_unregister_stop
November 6, 2023 18:06 3s
*: Move distance related defines into their own header Add a conflict label if PR needs to rebase #507: Commit 6fc9686 pushed by donaldsharp
November 6, 2023 14:35 3s zebra_h_cleanup
zebra_h_cleanup
November 6, 2023 14:35 3s
distance Add a conflict label if PR needs to rebase #506: Commit c7eadda pushed by donaldsharp
November 6, 2023 14:32 2s zebra_h_cleanup
zebra_h_cleanup
November 6, 2023 14:32 2s
*: Move distance related defines into their own header Add a conflict label if PR needs to rebase #505: Commit 7dc4826 pushed by donaldsharp
November 6, 2023 14:30 2s zebra_h_cleanup
zebra_h_cleanup
November 6, 2023 14:30 2s
zebra: When using Nexthop groups, use v6 RR semantics Add a conflict label if PR needs to rebase #504: Commit 7e1b56b pushed by donaldsharp
November 6, 2023 13:58 3s v6_rr_semantics_zrouter
v6_rr_semantics_zrouter
November 6, 2023 13:58 3s
lib: Remove unused WQ_RETRY_XXX enums Add a conflict label if PR needs to rebase #503: Commit 2a65f05 pushed by donaldsharp
November 3, 2023 18:06 3s workqueue_cleanup
workqueue_cleanup
November 3, 2023 18:06 3s