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
320 workflow runs
320 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

bgpd: bgp_sync_label_manager failure case Add a conflict label if PR needs to rebase #560: Commit 02049ff pushed by donaldsharp
January 7, 2024 01:30 2s label_pool_manager
label_pool_manager
January 7, 2024 01:30 2s
lib: limits.h is not needed by zebra.h Add a conflict label if PR needs to rebase #559: Commit 644bc91 pushed by donaldsharp
January 6, 2024 15:50 2s lib_zebra_h_cleanup_2
lib_zebra_h_cleanup_2
January 6, 2024 15:50 2s
lib: limits.h is not needed by zebra.h Add a conflict label if PR needs to rebase #558: Commit 7507b05 pushed by donaldsharp
January 5, 2024 18:56 2s lib_zebra_h_cleanup_2
lib_zebra_h_cleanup_2
January 5, 2024 18:56 2s
mgmtd: msg is assigned yet never used again Add a conflict label if PR needs to rebase #557: Commit 7cc33ef pushed by donaldsharp
January 5, 2024 18:41 2s SA_problems_local
SA_problems_local
January 5, 2024 18:41 2s
lib: limits.h is not needed by zebra.h Add a conflict label if PR needs to rebase #556: Commit a9cb632 pushed by donaldsharp
January 5, 2024 15:02 2s lib_zebra_h_cleanup_2
lib_zebra_h_cleanup_2
January 5, 2024 15:02 2s
lib: sys/utsname.h is not needed in zebra.h Add a conflict label if PR needs to rebase #555: Commit 496d87c pushed by donaldsharp
January 4, 2024 20:34 2s lib_zebra_h_cleanup
lib_zebra_h_cleanup
January 4, 2024 20:34 2s
lib: sys/utsname.h is not needed in zebra.h Add a conflict label if PR needs to rebase #554: Commit fa3d8de pushed by donaldsharp
January 4, 2024 20:15 2s lib_zebra_h_cleanup
lib_zebra_h_cleanup
January 4, 2024 20:15 2s
lib: sys/utsname.h is not needed in zebra.h Add a conflict label if PR needs to rebase #553: Commit 98c6e06 pushed by donaldsharp
January 4, 2024 19:59 3s lib_zebra_h_cleanup
lib_zebra_h_cleanup
January 4, 2024 19:59 3s
lib: Keychain.c was using free Add a conflict label if PR needs to rebase #552: Commit 09fbf2e pushed by donaldsharp
December 21, 2023 22:02 2s keychain_free_no_i_really_mean_it
keychain_free_no_i_really_mean_it
December 21, 2023 22:02 2s
tools: Add some more data to support bundles Add a conflict label if PR needs to rebase #551: Commit daa80a5 pushed by donaldsharp
December 21, 2023 20:43 3s generate_support_bundle_on_test_failure
generate_support_bundle_on_test_failure
December 21, 2023 20:43 3s
nhrpd: Cleanup a hash on nhrp shutdown Add a conflict label if PR needs to rebase #550: Commit e700069 pushed by donaldsharp
December 16, 2023 19:46 3s more_frr_memory_leaks_on_shutdown
more_frr_memory_leaks_on_shutdown
December 16, 2023 19:46 3s
lib: Provide a 'clear memory' command to run malloc_trim Add a conflict label if PR needs to rebase #549: Commit 0d240f3 pushed by donaldsharp
December 14, 2023 16:40 3s malloc_trim_implementation_8.5
malloc_trim_implementation_8.5
December 14, 2023 16:40 3s
lib: Provide a 'clear memory' command to run malloc_trim Add a conflict label if PR needs to rebase #548: Commit 124eee0 pushed by donaldsharp
December 14, 2023 16:40 3s malloc_trim_implementation
malloc_trim_implementation
December 14, 2023 16:40 3s
tests: ospf_suppress_fa sleeps, convert to run_and_expect Add a conflict label if PR needs to rebase #547: Commit 48df84a pushed by donaldsharp
December 14, 2023 15:43 2s test_ospf_suppress_fa_cleanup
test_ospf_suppress_fa_cleanup
December 14, 2023 15:43 2s
zebra: Use event_add_event instead of _timer Add a conflict label if PR needs to rebase #546: Commit 61af06c pushed by donaldsharp
December 14, 2023 14:14 3s dplane_fpm_nl_wedgied
dplane_fpm_nl_wedgied
December 14, 2023 14:14 3s
zebra: Prevent possible wedged fpm write Add a conflict label if PR needs to rebase #545: Commit f132246 pushed by donaldsharp
December 14, 2023 14:00 3s dplane_fpm_nl_wedgied
dplane_fpm_nl_wedgied
December 14, 2023 14:00 3s
tests: ospf_suppress_fa sleeps, convert to run_and_expect Add a conflict label if PR needs to rebase #544: Commit 245b68d pushed by donaldsharp
December 13, 2023 17:07 2s test_ospf_suppress_fa_cleanup
test_ospf_suppress_fa_cleanup
December 13, 2023 17:07 2s
bgpd: Have show bgp vrf all ipv4 uni summ display vrf NAME Add a conflict label if PR needs to rebase #543: Commit 5be4ee9 pushed by donaldsharp
December 12, 2023 23:26 2s vrf_all_data
vrf_all_data
December 12, 2023 23:26 2s
bgpd: Have show bgp vrf all ipv4 uni summ display vrf NAME Add a conflict label if PR needs to rebase #542: Commit 7cf3943 pushed by donaldsharp
December 12, 2023 22:49 2s vrf_all_data
vrf_all_data
December 12, 2023 22:49 2s
bgpd: When receiving a label, store it Add a conflict label if PR needs to rebase #541: Commit dcaba9c pushed by donaldsharp
December 12, 2023 20:30 2s bgp_evpn_label_no_delete
bgp_evpn_label_no_delete
December 12, 2023 20:30 2s
bgpd: Make suppress-fib-pending clear peering Add a conflict label if PR needs to rebase #540: Commit bdb5ae8 pushed by donaldsharp
December 12, 2023 18:49 2s bgp_suppress_fib_clear_peers
bgp_suppress_fib_clear_peers
December 12, 2023 18:49 2s
zebra: Don't leak memory in rtadv.c code on shutdown Add a conflict label if PR needs to rebase #539: Commit 8fcacf6 pushed by donaldsharp
December 12, 2023 18:45 2s srv6_shutdown_zebra_deletion
srv6_shutdown_zebra_deletion
December 12, 2023 18:45 2s
zebra: Prefer local routes when they are the same Add a conflict label if PR needs to rebase #538: Commit fb1f2cc pushed by donaldsharp
December 12, 2023 17:21 3s local_preferred
local_preferred
December 12, 2023 17:21 3s
zebra: On shutdown, free up srv6 list data Add a conflict label if PR needs to rebase #537: Commit 9393d36 pushed by donaldsharp
December 12, 2023 17:04 3s srv6_shutdown_zebra_deletion
srv6_shutdown_zebra_deletion
December 12, 2023 17:04 3s
zebra: On shutdown properly free up ns memory Add a conflict label if PR needs to rebase #536: Commit 3d1f0c4 pushed by donaldsharp
December 11, 2023 20:49 4s zebra_delete_memory_problems
zebra_delete_memory_problems
December 11, 2023 20:49 4s
ProTip! You can narrow down the results and go further in time using created:<2023-12-11 or the other filters available.