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

Revert "Merge branch 'ashred/RM_3626598' into 'dev'" Add a conflict label if PR needs to rebase #785: Commit f33b3df pushed by donaldsharp
December 19, 2024 17:10 2s sharpd/10_0_stable_internal
sharpd/10_0_stable_internal
December 19, 2024 17:10 2s
[CUMULUS]bgpd: Fix messup in port Add a conflict label if PR needs to rebase #784: Commit e3a92c0 pushed by donaldsharp
December 19, 2024 16:56 3s sharpd/10_0_stable_internal
sharpd/10_0_stable_internal
December 19, 2024 16:56 3s
bgpd: Implement BGP-wide configuration for graceful restart Add a conflict label if PR needs to rebase #783: Commit 0f6c5c5 pushed by donaldsharp
December 18, 2024 22:20 3s sharpd/10_0_stable_internal
sharpd/10_0_stable_internal
December 18, 2024 22:20 3s
lib, vtysh: Stop processing vtysh commands when FRR is shutting down. Add a conflict label if PR needs to rebase #782: Commit e0dc1ba pushed by donaldsharp
December 18, 2024 21:35 2s sharpd/10_0_stable_internal
sharpd/10_0_stable_internal
December 18, 2024 21:35 2s
[CUMULUS] zebra: Fix the zebra Dplane core Add a conflict label if PR needs to rebase #781: Commit a735067 pushed by donaldsharp
December 18, 2024 21:16 3s sharpd/10_0_stable_internal
sharpd/10_0_stable_internal
December 18, 2024 21:16 3s
bgpd: Fixed crashes in bgp received-routes brief and detail json Add a conflict label if PR needs to rebase #780: Commit 330c4ad pushed by donaldsharp
December 18, 2024 20:57 2s sharpd/10_0_stable_internal
sharpd/10_0_stable_internal
December 18, 2024 20:57 2s
zebra: avoid using freed vtep addr Add a conflict label if PR needs to rebase #779: Commit 63eb0d0 pushed by donaldsharp
December 18, 2024 19:24 3s sharpd/10_0_stable_internal
sharpd/10_0_stable_internal
December 18, 2024 19:24 3s
ospfd:[clear] nv action clear should give error when there is no OSPF… Add a conflict label if PR needs to rebase #778: Commit 16dc582 pushed by donaldsharp
December 18, 2024 17:13 2s sharpd/10_0_stable_internal
sharpd/10_0_stable_internal
December 18, 2024 17:13 2s
tools: fix frr-reload for nbr deletion Add a conflict label if PR needs to rebase #777: Commit 9c2e9db pushed by donaldsharp
December 18, 2024 17:06 3s sharpd/10_0_stable_internal
sharpd/10_0_stable_internal
December 18, 2024 17:06 3s
pimd: Fix for MC frame loss in a sequential traffic test Add a conflict label if PR needs to rebase #776: Commit 7846836 pushed by donaldsharp
December 18, 2024 16:18 3s sharpd/10_0_stable_internal
sharpd/10_0_stable_internal
December 18, 2024 16:18 3s
[CUMULUS] tools: Avoid bgp peer reset when toggling pwd-obfus config Add a conflict label if PR needs to rebase #775: Commit 9acee40 pushed by donaldsharp
December 18, 2024 16:13 3s sharpd/10_0_stable_internal
sharpd/10_0_stable_internal
December 18, 2024 16:13 3s
zebra: New RTM flag RTM_F_LAST_ROUTE Add a conflict label if PR needs to rebase #774: Commit d8c0aff pushed by donaldsharp
December 17, 2024 19:27 2s sharpd/10_0_stable_internal
sharpd/10_0_stable_internal
December 17, 2024 19:27 2s
zebra: Add uptime string format for non-json cli output Add a conflict label if PR needs to rebase #773: Commit 5b8b454 pushed by donaldsharp
December 17, 2024 17:55 3s sharpd/10_0_stable_internal
sharpd/10_0_stable_internal
December 17, 2024 17:55 3s
pimd: capture pim_msg_send_frame return Add a conflict label if PR needs to rebase #772: Commit e414e24 pushed by donaldsharp
December 13, 2024 21:51 3s sharpd/10_0_stable_internal
sharpd/10_0_stable_internal
December 13, 2024 21:51 3s
[CUMULUS]tests: Exclude test_grpc.py from build Add a conflict label if PR needs to rebase #771: Commit af75112 pushed by donaldsharp
December 13, 2024 20:59 2s sharpd/10_0_stable_internal
sharpd/10_0_stable_internal
December 13, 2024 20:59 2s
[CUMULUS]tests: Exclude test_grpc.py from build Add a conflict label if PR needs to rebase #770: Commit 6c785ab pushed by donaldsharp
December 13, 2024 18:52 3s sharpd/10_0_stable_internal
sharpd/10_0_stable_internal
December 13, 2024 18:52 3s
[CUMULUS]debian: Fix control for building Add a conflict label if PR needs to rebase #769: Commit c623f0e pushed by donaldsharp
December 13, 2024 18:49 3s sharpd/10_0_stable_internal
sharpd/10_0_stable_internal
December 13, 2024 18:49 3s
[CUMULUS] pimd: Reverting assert introduced upstream Add a conflict label if PR needs to rebase #768: Commit 93596c2 pushed by donaldsharp
December 13, 2024 17:41 2s sharpd/10_0_stable_internal
sharpd/10_0_stable_internal
December 13, 2024 17:41 2s
lib, zebra: Ensure time has enough accuracy on startup Add a conflict label if PR needs to rebase #767: Commit 6d7f99e pushed by donaldsharp
December 13, 2024 17:25 3s sharpd/10_0_stable_internal
sharpd/10_0_stable_internal
December 13, 2024 17:25 3s
bgpd: Fix wrong pthread event cancelling Add a conflict label if PR needs to rebase #766: Commit fbf69f9 pushed by donaldsharp
December 13, 2024 16:19 3s 202411_15572_backport
202411_15572_backport
December 13, 2024 16:19 3s
bgpd: Sort the bgp_path_info's Add a conflict label if PR needs to rebase #765: Commit 87c736f pushed by donaldsharp
December 13, 2024 01:41 2s 15572_to_10_0_1
15572_to_10_0_1
December 13, 2024 01:41 2s
[CUMULUS] Revert "vtysh: Add error code if daemon is not running" Add a conflict label if PR needs to rebase #764: Commit 451da6b pushed by donaldsharp
December 12, 2024 00:21 3s sharpd/10_0_stable_internal
sharpd/10_0_stable_internal
December 12, 2024 00:21 3s
zebra: set vlan_id/bridge_if on l3vni configure Add a conflict label if PR needs to rebase #763: Commit d86ef6d pushed by donaldsharp
December 11, 2024 23:49 3s sharpd/10_0_stable_internal
sharpd/10_0_stable_internal
December 11, 2024 23:49 3s
zebra: add vni bridge vlan info in json output Add a conflict label if PR needs to rebase #762: Commit 638b6a9 pushed by donaldsharp
December 9, 2024 13:41 3s sharpd/10_0_stable_internal
sharpd/10_0_stable_internal
December 9, 2024 13:41 3s
zebra: rework arp-nd-redirect udp sock handling Add a conflict label if PR needs to rebase #761: Commit f636782 pushed by donaldsharp
December 8, 2024 15:29 2s sharpd/10_0_stable_internal
sharpd/10_0_stable_internal
December 8, 2024 15:29 2s