Skip to content

Actions: pguibert6WIND/frr

Actions

Add a conflict label if PR needs to rebase

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
332 workflow runs
332 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

topotests: add mpls l3vpn test with default vrf Add a conflict label if PR needs to rebase #760: Commit f717c4b pushed by pguibert6WIND
April 3, 2024 10:26 2s srv6_default_vrf
srv6_default_vrf
April 3, 2024 10:26 2s
isis, lib: add isis srv6 capability to ls_node Add a conflict label if PR needs to rebase #759: Commit 327cbb9 pushed by pguibert6WIND
April 3, 2024 09:43 3s link_state_srv6_capas
link_state_srv6_capas
April 3, 2024 09:43 3s
zebra: fix static srv6 segment-list sid order Add a conflict label if PR needs to rebase #758: Commit c4f20bb pushed by pguibert6WIND
April 3, 2024 09:39 1s srv6_seg_list_sid_order
srv6_seg_list_sid_order
April 3, 2024 09:39 1s
Revert "topotests: add an ebgp 6vpe test" Add a conflict label if PR needs to rebase #757: Commit 91956ac pushed by pguibert6WIND
April 3, 2024 09:37 2s bgp_nhg_optimisations_no_double_hash_list
bgp_nhg_optimisations_no_double_hash_list
April 3, 2024 09:37 2s
bgpd: fix use real SID in BGP nexthop tracking Add a conflict label if PR needs to rebase #756: Commit a301504 pushed by pguibert6WIND
April 3, 2024 09:36 2s bgp_srv6_real_sid
bgp_srv6_real_sid
April 3, 2024 09:36 2s
zebra: change default mpls interface settings to auto mode Add a conflict label if PR needs to rebase #755: Commit fc5a397 pushed by pguibert6WIND
April 3, 2024 09:35 2s mpls_yang
mpls_yang
April 3, 2024 09:35 2s
Merge pull request #15628 from opensourcerouting/fix/bgp_prefix_sid_c… Add a conflict label if PR needs to rebase #754: Commit 6bea75f pushed by pguibert6WIND
April 3, 2024 09:33 3s ospf_restart_suppoort
ospf_restart_suppoort
April 3, 2024 09:33 3s
zebra: change default mpls interface settings to auto mode Add a conflict label if PR needs to rebase #753: Commit ee5e2a1 pushed by pguibert6WIND
April 3, 2024 08:59 3s mpls_yang
mpls_yang
April 3, 2024 08:59 3s
zebra: fix static srv6 segment-list sid order Add a conflict label if PR needs to rebase #752: Commit 2cad071 pushed by pguibert6WIND
April 3, 2024 06:08 2s srv6_seg_list_sid_order
srv6_seg_list_sid_order
April 3, 2024 06:08 2s
bgpd: fix use real SID in BGP nexthop tracking Add a conflict label if PR needs to rebase #751: Commit 0b40189 pushed by pguibert6WIND
April 3, 2024 06:07 2s bgp_srv6_real_sid
bgp_srv6_real_sid
April 3, 2024 06:07 2s
isis, lib: add isis srv6 capability to ls_node Add a conflict label if PR needs to rebase #750: Commit 74e38f4 pushed by pguibert6WIND
April 2, 2024 09:03 2s link_state_srv6_capas
link_state_srv6_capas
April 2, 2024 09:03 2s
topotests: bgp_backup_route, add addpath-tx-best-selected tests Add a conflict label if PR needs to rebase #749: Commit 1581241 pushed by pguibert6WIND
April 2, 2024 07:15 2s backup_route
backup_route
April 2, 2024 07:15 2s
zebra: change default mpls interface settings to auto mode Add a conflict label if PR needs to rebase #748: Commit 52a4017 pushed by pguibert6WIND
April 2, 2024 07:14 2s mpls_yang
mpls_yang
April 2, 2024 07:14 2s
zebra, topotests: autorise nexthop interface labelled routes Add a conflict label if PR needs to rebase #747: Commit fe3a55f pushed by pguibert6WIND
April 2, 2024 07:12 2s autorise_label_nexthop_iface_2
autorise_label_nexthop_iface_2
April 2, 2024 07:12 2s
topotests: nhrp_topo1, ignore the 'used' variable of cache entries Add a conflict label if PR needs to rebase #746: Commit 8f24211 pushed by pguibert6WIND
April 2, 2024 07:11 2s nhrp_maintain_used_state
nhrp_maintain_used_state
April 2, 2024 07:11 2s
bgpd: fix use real SID in BGP nexthop tracking Add a conflict label if PR needs to rebase #745: Commit e13ffc1 pushed by pguibert6WIND
April 2, 2024 07:10 2s bgp_srv6_real_sid
bgp_srv6_real_sid
April 2, 2024 07:10 2s
zebra: fix static srv6 segment-list sid order Add a conflict label if PR needs to rebase #744: Commit 3119805 pushed by pguibert6WIND
April 2, 2024 07:09 2s srv6_seg_list_sid_order
srv6_seg_list_sid_order
April 2, 2024 07:09 2s
Revert "topotests: add an ebgp 6vpe test" Add a conflict label if PR needs to rebase #743: Commit f7e0c87 pushed by pguibert6WIND
March 30, 2024 20:41 2s bgp_nhg_optimisations
bgp_nhg_optimisations
March 30, 2024 20:41 2s
Revert "topotests: add an ebgp 6vpe test" Add a conflict label if PR needs to rebase #742: Commit 52887f1 pushed by pguibert6WIND
March 30, 2024 10:15 3s bgp_nhg_optimisations
bgp_nhg_optimisations
March 30, 2024 10:15 3s
bgpd: add resolved_prefix visibility on nht Add a conflict label if PR needs to rebase #741: Commit e20faa9 pushed by pguibert6WIND
March 29, 2024 16:27 2s resolved_prefix_bgp
resolved_prefix_bgp
March 29, 2024 16:27 2s
Revert "topotests: add an ebgp 6vpe test" Add a conflict label if PR needs to rebase #740: Commit 98d0339 pushed by pguibert6WIND
March 29, 2024 16:27 1s bgp_nhg_optimisations
bgp_nhg_optimisations
March 29, 2024 16:27 1s
Revert "topotests: add an ebgp 6vpe test" Add a conflict label if PR needs to rebase #739: Commit 98d0339 pushed by pguibert6WIND
March 29, 2024 16:27 2s resolved_prefix_bgp
resolved_prefix_bgp
March 29, 2024 16:27 2s
bgpd: add resolved_prefix visibility on nht Add a conflict label if PR needs to rebase #738: Commit e20faa9 pushed by pguibert6WIND
March 29, 2024 16:23 2s resolved_prefix_bgp
resolved_prefix_bgp
March 29, 2024 16:23 2s
Revert "topotests: add an ebgp 6vpe test" Add a conflict label if PR needs to rebase #737: Commit 45f2e99 pushed by pguibert6WIND
March 29, 2024 16:19 2s bgp_nhg_optimisations
bgp_nhg_optimisations
March 29, 2024 16:19 2s
Revert "topotests: add an ebgp 6vpe test" Add a conflict label if PR needs to rebase #736: Commit df9f373 pushed by pguibert6WIND
March 29, 2024 13:17 2s revert_6vpe_fix
revert_6vpe_fix
March 29, 2024 13:17 2s