Skip to content

Actions: lsang6WIND/frr

Actions

Add a conflict label if PR needs to rebase

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
24 workflow runs
24 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Merge branch 'FRRouting:master' into master Add a conflict label if PR needs to rebase #24: Commit 9d854ba pushed by lsang6WIND
June 24, 2024 08:59 2s master-fake
master-fake
June 24, 2024 08:59 2s
bgpd: avoid clearing routes for peers that were never established Add a conflict label if PR needs to rebase #23: Commit 050e751 pushed by lsang6WIND
June 24, 2024 08:52 2s bgp-timeout
bgp-timeout
June 24, 2024 08:52 2s
Merge branch 'FRRouting:master' into master Add a conflict label if PR needs to rebase #22: Commit 9d854ba pushed by lsang6WIND
May 30, 2024 09:04 2s master
master
May 30, 2024 09:04 2s
yang: use relative path instead of absolute one for route-map Add a conflict label if PR needs to rebase #21: Commit f1ea52b pushed by lsang6WIND
May 29, 2024 11:11 3s relative_path
relative_path
May 29, 2024 11:11 3s
yang: use relative path instead of absolute one for route-map Add a conflict label if PR needs to rebase #20: Commit d029222 pushed by lsang6WIND
May 29, 2024 11:07 2s relative_path
relative_path
May 29, 2024 11:07 2s
yang: use relative path instead of absolute one for route-map Add a conflict label if PR needs to rebase #19: Commit 169466c pushed by lsang6WIND
May 29, 2024 11:07 2s relative_path
relative_path
May 29, 2024 11:07 2s
yang: use relative path instead of absolute one for route-map Add a conflict label if PR needs to rebase #18: Commit f968845 pushed by lsang6WIND
May 29, 2024 11:04 2s relative_path
relative_path
May 29, 2024 11:04 2s
Merge pull request #15082 from louis-6wind/fix-iff-lower-up Add a conflict label if PR needs to rebase #17: Commit f8abf96 pushed by lsang6WIND
May 29, 2024 11:03 2s relative_path
relative_path
May 29, 2024 11:03 2s
Merge branch 'FRRouting:master' into master Add a conflict label if PR needs to rebase #16: Commit 97edb7a pushed by lsang6WIND
May 29, 2024 11:02 2s relative_path
relative_path
May 29, 2024 11:02 2s
Merge pull request #15082 from louis-6wind/fix-iff-lower-up Add a conflict label if PR needs to rebase #15: Commit f8abf96 pushed by lsang6WIND
May 29, 2024 11:02 2s relative_path
relative_path
May 29, 2024 11:02 2s
Merge branch 'FRRouting:master' into master Add a conflict label if PR needs to rebase #14: Commit 97edb7a pushed by lsang6WIND
May 29, 2024 08:58 2s relative_path
relative_path
May 29, 2024 08:58 2s
Merge branch 'FRRouting:master' into master Add a conflict label if PR needs to rebase #13: Commit 97edb7a pushed by lsang6WIND
May 29, 2024 08:55 2s master
master
May 29, 2024 08:55 2s
Merge pull request #16032 from Pdoijode/pdoijode/zebra-rt-deny-fix Add a conflict label if PR needs to rebase #12: Commit 4bd1648 pushed by lsang6WIND
May 22, 2024 14:30 2s running-config
running-config
May 22, 2024 14:30 2s
Merge branch 'FRRouting:master' into master Add a conflict label if PR needs to rebase #11: Commit afa2b3c pushed by lsang6WIND
May 22, 2024 14:29 2s master
master
May 22, 2024 14:29 2s
Merge branch 'FRRouting:master' into master Add a conflict label if PR needs to rebase #10: Commit 2576aa6 pushed by lsang6WIND
May 7, 2024 15:12 2s master
master
May 7, 2024 15:12 2s
if: fix same connected address Add a conflict label if PR needs to rebase #9: Commit 9eda89a pushed by lsang6WIND
May 7, 2024 15:10 3s fix-same-prefix
fix-same-prefix
May 7, 2024 15:10 3s
if: fix same connected address Add a conflict label if PR needs to rebase #8: Commit 9eda89a pushed by lsang6WIND
May 6, 2024 16:16 1s fix-same-prefix
fix-same-prefix
May 6, 2024 16:16 1s
Merge pull request #15902 from opensourcerouting/build-xref-setup-hppa Add a conflict label if PR needs to rebase #7: Commit 216bac2 pushed by lsang6WIND
May 6, 2024 16:15 2s fix-same-prefix
fix-same-prefix
May 6, 2024 16:15 2s
Merge pull request #15902 from opensourcerouting/build-xref-setup-hppa Add a conflict label if PR needs to rebase #6: Commit 216bac2 pushed by lsang6WIND
May 6, 2024 16:13 2s fix-same-prefix
fix-same-prefix
May 6, 2024 16:13 2s
if: fix same connected address Add a conflict label if PR needs to rebase #5: Commit 4567328 pushed by lsang6WIND
May 6, 2024 16:12 2s fix-same-prefix
fix-same-prefix
May 6, 2024 16:12 2s
Merge branch 'FRRouting:master' into master Add a conflict label if PR needs to rebase #4: Commit 4b69618 pushed by lsang6WIND
May 6, 2024 15:58 2s master
master
May 6, 2024 15:58 2s
Merge branch 'FRRouting:master' into master Add a conflict label if PR needs to rebase #3: Commit c7079a1 pushed by lsang6WIND
April 2, 2024 09:14 3s master
master
April 2, 2024 09:14 3s
bgpd: refactor peer timers Add a conflict label if PR needs to rebase #2: Commit 17f9dac pushed by lsang6WIND
March 29, 2024 14:14 2s master
master
March 29, 2024 14:14 2s
bgpd: refactor peer timers Add a conflict label if PR needs to rebase #1: Commit 78eb4d0 pushed by lsang6WIND
March 29, 2024 13:38 3s master
master
March 29, 2024 13:38 3s