Skip to content

Actions: opensourcerouting/frr

Actions

Add a conflict label if PR needs to rebase

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
2,192 workflow runs
2,192 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

bgpd: Ignore RFC8212 for BGP Confederations Add a conflict label if PR needs to rebase #3330: Commit b76885e pushed by ton31337
July 1, 2024 19:31 3s fix/backport_fd3e0047d389569d473685369acefd8e448e0e31_9.1
fix/backport_fd3e0047d389569d473685369acefd8e448e0e31_9.1
July 1, 2024 19:31 3s
bgpd: Ignore RFC8212 for BGP Confederations Add a conflict label if PR needs to rebase #3329: Commit 96106eb pushed by ton31337
July 1, 2024 19:27 3s fix/backport_fd3e0047d389569d473685369acefd8e448e0e31_9.1
fix/backport_fd3e0047d389569d473685369acefd8e448e0e31_9.1
July 1, 2024 19:27 3s
Merge pull request #16286 from opensourcerouting/fix/backport_c95755f… Add a conflict label if PR needs to rebase #3328: Commit 8093e98 pushed by NetDEF-CI
June 25, 2024 18:25 3s stable/9.0
stable/9.0
June 25, 2024 18:25 3s
Merge pull request #16293 from FRRouting/mergify/bp/stable/9.1/pr-16214 Add a conflict label if PR needs to rebase #3327: Commit dca6ed0 pushed by NetDEF-CI
June 25, 2024 11:45 2s stable/9.1
stable/9.1
June 25, 2024 11:45 2s
Merge pull request #16294 from FRRouting/mergify/bp/stable/9.0/pr-16214 Add a conflict label if PR needs to rebase #3326: Commit 82d0e81 pushed by NetDEF-CI
June 25, 2024 11:45 2s stable/9.0
stable/9.0
June 25, 2024 11:45 2s
Merge pull request #16295 from FRRouting/mergify/bp/stable/8.5/pr-16214 Add a conflict label if PR needs to rebase #3325: Commit 7d4786c pushed by NetDEF-CI
June 25, 2024 11:45 3s stable/8.5
stable/8.5
June 25, 2024 11:45 3s
Merge pull request #16283 from FRRouting/mergify/bp/stable/10.0/pr-15838 Add a conflict label if PR needs to rebase #3324: Commit a9cb4fd pushed by NetDEF-CI
June 25, 2024 11:35 3s stable/10.0
stable/10.0
June 25, 2024 11:35 3s
Merge pull request #16279 from FRRouting/mergify/bp/stable/10.0/pr-16211 Add a conflict label if PR needs to rebase #3323: Commit bbb2ae0 pushed by NetDEF-CI
June 25, 2024 10:55 2s stable/10.0
stable/10.0
June 25, 2024 10:55 2s
Merge pull request #16276 from FRRouting/mergify/bp/stable/9.1/pr-16242 Add a conflict label if PR needs to rebase #3322: Commit d1b69e0 pushed by NetDEF-CI
June 25, 2024 10:55 2s stable/9.1
stable/9.1
June 25, 2024 10:55 2s
bgpd: Set last reset reason to admin shutdown if it was manually Add a conflict label if PR needs to rebase #3321: Commit c5ecd1e pushed by ton31337
June 25, 2024 05:55 2s fix/backport_c95755f046ee01f34bdd06d3663e0fd355e48dbd_9.0
fix/backport_c95755f046ee01f34bdd06d3663e0fd355e48dbd_9.0
June 25, 2024 05:55 2s
Merge pull request #16275 from FRRouting/mergify/bp/stable/10.0/pr-16242 Add a conflict label if PR needs to rebase #3320: Commit 812556c pushed by NetDEF-CI
June 25, 2024 05:35 2s stable/10.0
stable/10.0
June 25, 2024 05:35 2s
Merge pull request #16280 from FRRouting/mergify/bp/stable/9.1/pr-16211 Add a conflict label if PR needs to rebase #3319: Commit 2187f54 pushed by NetDEF-CI
June 25, 2024 05:35 3s stable/9.1
stable/9.1
June 25, 2024 05:35 3s
bgpd: Set last reset reason to admin shutdown if it was manually Add a conflict label if PR needs to rebase #3318: Commit bebfd0f pushed by ton31337
June 25, 2024 05:15 2s fix/backport_c95755f046ee01f34bdd06d3663e0fd355e48dbd_9.0
fix/backport_c95755f046ee01f34bdd06d3663e0fd355e48dbd_9.0
June 25, 2024 05:15 2s
Merge pull request #16268 from louis-6wind/show-isis-database-crash-bp Add a conflict label if PR needs to rebase #3317: Commit 15da768 pushed by NetDEF-CI
June 24, 2024 21:25 3s stable/10.0
stable/10.0
June 24, 2024 21:25 3s
Merge pull request #16265 from FRRouting/mergify/bp/stable/10.0/pr-16252 Add a conflict label if PR needs to rebase #3316: Commit 75757a2 pushed by NetDEF-CI
June 22, 2024 18:15 3s stable/10.0
stable/10.0
June 22, 2024 18:15 3s
Merge pull request #16263 from FRRouting/mergify/bp/stable/10.0/pr-16260 Add a conflict label if PR needs to rebase #3315: Commit 071678c pushed by NetDEF-CI
June 21, 2024 14:55 2s stable/10.0
stable/10.0
June 21, 2024 14:55 2s
Merge pull request #16266 from FRRouting/mergify/bp/stable/9.1/pr-16252 Add a conflict label if PR needs to rebase #3314: Commit de0f0bd pushed by NetDEF-CI
June 21, 2024 14:55 2s stable/9.1
stable/9.1
June 21, 2024 14:55 2s
redhat: Add option to build pkg with grpc support Add a conflict label if PR needs to rebase #3313: Commit a761db8 pushed by mwinter-osr
June 20, 2024 10:15 3s pkgs-with-grpc
pkgs-with-grpc
June 20, 2024 10:15 3s
Merge pull request #16203 from FRRouting/mergify/bp/stable/10.0/pr-16191 Add a conflict label if PR needs to rebase #3312: Commit 84bbd16 pushed by NetDEF-CI
June 14, 2024 12:35 2s stable/10.0
stable/10.0
June 14, 2024 12:35 2s
Merge pull request #16206 from FRRouting/mergify/bp/stable/8.5/pr-16191 Add a conflict label if PR needs to rebase #3311: Commit 96f4dde pushed by NetDEF-CI
June 14, 2024 12:35 2s stable/8.5
stable/8.5
June 14, 2024 12:35 2s
Merge pull request #16215 from FRRouting/mergify/bp/stable/9.0/pr-13970 Add a conflict label if PR needs to rebase #3310: Commit 3853b15 pushed by NetDEF-CI
June 14, 2024 12:15 2s stable/9.0
stable/9.0
June 14, 2024 12:15 2s
Merge pull request #16216 from FRRouting/mergify/bp/stable/8.5/pr-13970 Add a conflict label if PR needs to rebase #3309: Commit a63f510 pushed by NetDEF-CI
June 14, 2024 12:15 2s stable/8.5
stable/8.5
June 14, 2024 12:15 2s
Merge pull request #16204 from FRRouting/mergify/bp/stable/9.1/pr-16191 Add a conflict label if PR needs to rebase #3308: Commit 44ec9cd pushed by NetDEF-CI
June 13, 2024 20:05 2s stable/9.1
stable/9.1
June 13, 2024 20:05 2s
Merge pull request #16205 from FRRouting/mergify/bp/stable/9.0/pr-16191 Add a conflict label if PR needs to rebase #3307: Commit 41bbb84 pushed by NetDEF-CI
June 13, 2024 20:05 2s stable/9.0
stable/9.0
June 13, 2024 20:05 2s
Merge pull request #16212 from FRRouting/mergify/bp/stable/10.0/pr-16210 Add a conflict label if PR needs to rebase #3306: Commit baac0fc pushed by NetDEF-CI
June 13, 2024 19:55 2s stable/10.0
stable/10.0
June 13, 2024 19:55 2s