Skip to content

Actions: FRRouting/frr

Actions

Add a conflict label if PR needs to rebase

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
220 workflow run results
220 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

ospfd:fix show_ip_ospf_gr_helper Add a conflict label if PR needs to rebase #5568: Pull request #14710 synchronize by teletajp
November 15, 2023 13:24 23s
November 15, 2023 13:24 23s
Print all errors when validating NB configuration Add a conflict label if PR needs to rebase #5567: Pull request #14800 synchronize by idryzhov
November 15, 2023 13:17 18s
November 15, 2023 13:17 18s
zebra: Refactor memory allocation in zebra_rnh.c Add a conflict label if PR needs to rebase #5566: Commit c8431f0 pushed by mergify bot
November 15, 2023 12:28 12s mergify/bp/stable/9.0/pr-14798
mergify/bp/stable/9.0/pr-14798
November 15, 2023 12:28 12s
zebra: Refactor memory allocation in zebra_rnh.c Add a conflict label if PR needs to rebase #5565: Commit fbb9a78 pushed by mergify bot
November 15, 2023 12:28 11s mergify/bp/stable/9.1/pr-14798
mergify/bp/stable/9.1/pr-14798
November 15, 2023 12:28 11s
Merge pull request #14798 from Keelan10/zebra-fix-json-leak Add a conflict label if PR needs to rebase #5564: Commit 43290b5 pushed by ton31337
November 15, 2023 12:27 8m 28s master
master
November 15, 2023 12:27 8m 28s
Merge pull request #14801 from FRRouting/mergify/bp/stable/9.1/pr-14796 Add a conflict label if PR needs to rebase #5563: Commit 612f1f5 pushed by ton31337
November 15, 2023 12:27 14s stable/9.1
stable/9.1
November 15, 2023 12:27 14s
zebra: Adding a new dataplane using protobuf Add a conflict label if PR needs to rebase #5562: Pull request #14173 synchronize by BIoodborne
November 15, 2023 08:06 23s
November 15, 2023 08:06 23s
sharpd: Set Callback Function for Memory Cleanup Add a conflict label if PR needs to rebase #5561: Pull request #14802 synchronize by Keelan10
November 15, 2023 07:59 14s
November 15, 2023 07:59 14s
lib: Prevent infinite loop in ospf Add a conflict label if PR needs to rebase #5560: Commit 77fe290 pushed by mergify bot
November 15, 2023 07:40 13s mergify/bp/stable/9.1/pr-14796
mergify/bp/stable/9.1/pr-14796
November 15, 2023 07:40 13s
Merge pull request #14796 from donaldsharp/ospf_bsd_double_whammy_no_… Add a conflict label if PR needs to rebase #5559: Commit 3a109ef pushed by ton31337
November 15, 2023 07:39 4m 27s master
master
November 15, 2023 07:39 4m 27s
lib: Introducing interface type to struct interface Add a conflict label if PR needs to rebase #5558: Pull request #14799 synchronize by raja-rajasekar
November 15, 2023 06:17 16s
November 15, 2023 06:17 16s
lib: Introducing interface type to struct interface Add a conflict label if PR needs to rebase #5557: Pull request #14799 synchronize by raja-rajasekar
November 15, 2023 06:17 19s
November 15, 2023 06:17 19s
Merge pull request #14794 from FRRouting/mergify/bp/stable/9.1/pr-14787 Add a conflict label if PR needs to rebase #5556: Commit b3bf380 pushed by ton31337
November 15, 2023 04:37 12s stable/9.1
stable/9.1
November 15, 2023 04:37 12s
nfware: mgmtd: add dataplane config output Add a conflict label if PR needs to rebase #5555: Commit 4f4cbe0 pushed by idryzhov
November 15, 2023 01:35 9s feature/dataplane-mgmtd
feature/dataplane-mgmtd
November 15, 2023 01:35 9s
Merge pull request #14793 from FRRouting/mergify/bp/stable/9.0/pr-14787 Add a conflict label if PR needs to rebase #5554: Commit 4565e57 pushed by ton31337
November 14, 2023 18:01 17s stable/9.0
stable/9.0
November 14, 2023 18:01 17s
lib: Prevent infinite loop in ospf Add a conflict label if PR needs to rebase #5553: Pull request #14796 synchronize by donaldsharp
November 14, 2023 17:02 20s
November 14, 2023 17:02 20s
bgpd:aspath leak fix Add a conflict label if PR needs to rebase #5552: Pull request #14757 synchronize by ryndia
November 14, 2023 16:39 17s
November 14, 2023 16:39 17s
Merge pull request #14712 from yenlu-keith/teamd-es-id Add a conflict label if PR needs to rebase #5551: Commit 858cc75 pushed by donaldsharp
November 14, 2023 16:20 10m 22s master
master
November 14, 2023 16:20 10m 22s
Merge pull request #14725 from donaldsharp/event_io_smoothing Add a conflict label if PR needs to rebase #5550: Commit 44df167 pushed by riw777
November 14, 2023 16:15 10m 24s master
master
November 14, 2023 16:15 10m 24s
ospf6d: Let the user override interface cost for a loopback Add a conflict label if PR needs to rebase #5549: Commit e611ca6 pushed by mergify bot
November 14, 2023 13:57 15s mergify/bp/stable/9.1/pr-14787
mergify/bp/stable/9.1/pr-14787
November 14, 2023 13:57 15s
ospf6d: Let the user override interface cost for a loopback Add a conflict label if PR needs to rebase #5548: Commit bcf2f05 pushed by mergify bot
November 14, 2023 13:57 15s mergify/bp/stable/9.0/pr-14787
mergify/bp/stable/9.0/pr-14787
November 14, 2023 13:57 15s
Merge pull request #14787 from opensourcerouting/fix/ospf6d_cost_fixup Add a conflict label if PR needs to rebase #5547: Commit aa521c6 pushed by riw777
November 14, 2023 13:56 8m 28s master
master
November 14, 2023 13:56 8m 28s
Merge pull request #14135 from squirrelking57/fix_isis_adj_level Add a conflict label if PR needs to rebase #5546: Commit 072a0b5 pushed by riw777
November 14, 2023 13:49 10m 28s master
master
November 14, 2023 13:49 10m 28s
Merge pull request #11800 from mxyns/bmp-locribmon Add a conflict label if PR needs to rebase #5545: Commit 8aae3ea pushed by riw777
November 14, 2023 13:27 8m 26s master
master
November 14, 2023 13:27 8m 26s
Add more northbound operation types Add a conflict label if PR needs to rebase #5544: Pull request #14542 synchronize by idryzhov
November 14, 2023 12:56 18s
November 14, 2023 12:56 18s