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
314 workflow runs
314 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

tests: Add a very simple test for the dplane_fpm_nl module Add a conflict label if PR needs to rebase #635: Commit 741b5eb pushed by donaldsharp
February 16, 2024 02:39 2s fpm_stub_addition
fpm_stub_addition
February 16, 2024 02:39 2s
tests: Add a very simple test for the dplane_fpm_nl module Add a conflict label if PR needs to rebase #634: Commit 5d67929 pushed by donaldsharp
February 16, 2024 02:16 3s fpm_stub_addition
fpm_stub_addition
February 16, 2024 02:16 3s
tests: Add a very simple test for the dplane_fpm_nl module Add a conflict label if PR needs to rebase #633: Commit a19a5bf pushed by donaldsharp
February 16, 2024 01:39 2s fpm_stub_addition
fpm_stub_addition
February 16, 2024 01:39 2s
tests: Add a very simple test for the dplane_fpm_nl module Add a conflict label if PR needs to rebase #632: Commit 9a8b73f pushed by donaldsharp
February 15, 2024 20:46 2s fpm_stub_addition
fpm_stub_addition
February 15, 2024 20:46 2s
tests: Add a very simple test for the dplane_fpm_nl module Add a conflict label if PR needs to rebase #631: Commit 51e8805 pushed by donaldsharp
February 15, 2024 15:35 2s fpm_stub_addition
fpm_stub_addition
February 15, 2024 15:35 2s
tests: fix ospf_suppress_fa timing issue Add a conflict label if PR needs to rebase #630: Commit 12f4e88 pushed by donaldsharp
February 15, 2024 15:34 3s fpm_stub_addition
fpm_stub_addition
February 15, 2024 15:34 3s
tests: fix ospf_suppress_fa timing issue Add a conflict label if PR needs to rebase #629: Commit 8c7b126 pushed by donaldsharp
February 15, 2024 15:22 3s fpm_stub_addition
fpm_stub_addition
February 15, 2024 15:22 3s
tests: Add a very simple test for the dplane_fpm_nl module Add a conflict label if PR needs to rebase #628: Commit 7859716 pushed by donaldsharp
February 15, 2024 13:08 2s fpm_stub_addition
fpm_stub_addition
February 15, 2024 13:08 2s
redhat: Ensure that the build depends on the correct version of libyang Add a conflict label if PR needs to rebase #627: Commit c682065 pushed by donaldsharp
February 15, 2024 13:01 2s fix_libyang_depends
fix_libyang_depends
February 15, 2024 13:01 2s
debian: Ensure we properly depend on the right version of libyang2 Add a conflict label if PR needs to rebase #626: Commit ee4d02a pushed by donaldsharp
February 15, 2024 12:59 3s fix_libyang_depends
fix_libyang_depends
February 15, 2024 12:59 3s
debian: Ensure we properly depend on the right version of libyang2 Add a conflict label if PR needs to rebase #625: Commit ee50dd4 pushed by donaldsharp
February 15, 2024 00:54 2s fix_libyang_depends
fix_libyang_depends
February 15, 2024 00:54 2s
tests: Add a very simple test for the dplane_fpm_nl module Add a conflict label if PR needs to rebase #624: Commit 55323e1 pushed by donaldsharp
February 15, 2024 00:22 2s fpm_stub_addition
fpm_stub_addition
February 15, 2024 00:22 2s
tests: Add a very simple test for the dplane_fpm_nl module Add a conflict label if PR needs to rebase #623: Commit 1806676 pushed by donaldsharp
February 15, 2024 00:08 2s fpm_stub_addition
fpm_stub_addition
February 15, 2024 00:08 2s
tests: Add a very simple test for the dplane_fpm_nl module Add a conflict label if PR needs to rebase #622: Commit a9b0c01 pushed by donaldsharp
February 14, 2024 22:05 2s fpm_stub_addition
fpm_stub_addition
February 14, 2024 22:05 2s
tests: Add a very simple test for the dplane_fpm_nl module Add a conflict label if PR needs to rebase #621: Commit 9ff4f83 pushed by donaldsharp
February 14, 2024 18:20 2s fpm_stub_addition
fpm_stub_addition
February 14, 2024 18:20 2s
tests: Add a very simple test for the dplane_fpm_nl module Add a conflict label if PR needs to rebase #620: Commit e5a3eb9 pushed by donaldsharp
February 14, 2024 17:53 3s fpm_stub_addition
fpm_stub_addition
February 14, 2024 17:53 3s
zebra: When reinstalling a NHG, set REINSTALL flag Add a conflict label if PR needs to rebase #619: Commit b2ade8e pushed by donaldsharp
February 8, 2024 17:48 2s nhg_stuffs
nhg_stuffs
February 8, 2024 17:48 2s
*: Remove int return for zapi functions Add a conflict label if PR needs to rebase #618: Commit 02c1576 pushed by donaldsharp
February 8, 2024 15:47 2s return_nothing_for_zapi
return_nothing_for_zapi
February 8, 2024 15:47 2s
Merge branch 'master' of https://github.com/frrouting/frr into return… Add a conflict label if PR needs to rebase #617: Commit de9f6f1 pushed by donaldsharp
February 8, 2024 15:47 2s return_nothing_for_zapi
return_nothing_for_zapi
February 8, 2024 15:47 2s
lib, ospfclient, tests, vtysh: Allow for a minimum fd poll size Add a conflict label if PR needs to rebase #616: Commit 729dd6f pushed by donaldsharp
February 7, 2024 15:38 2s vtysh_limit_fds
vtysh_limit_fds
February 7, 2024 15:38 2s
lib, ospfclient, tests, vtysh: Allow for a minimum fd poll size Add a conflict label if PR needs to rebase #615: Commit a0925ad pushed by donaldsharp
February 7, 2024 13:17 2s vtysh_limit_fds
vtysh_limit_fds
February 7, 2024 13:17 2s
lib, ospfclient, vtysh: Allow for a minimum fd poll size Add a conflict label if PR needs to rebase #614: Commit 9bedb67 pushed by donaldsharp
February 7, 2024 13:12 2s vtysh_limit_fds
vtysh_limit_fds
February 7, 2024 13:12 2s
doc: Add some documentation around a new pthread call Add a conflict label if PR needs to rebase #613: Commit c1e2086 pushed by donaldsharp
February 5, 2024 19:52 3s rcu_doc
rcu_doc
February 5, 2024 19:52 3s
zebra: Reorg struct route_entry to have important bits first Add a conflict label if PR needs to rebase #612: Commit 56e62d8 pushed by donaldsharp
February 5, 2024 19:18 2s reorg_route_entry
reorg_route_entry
February 5, 2024 19:18 2s
Add a conflict label if PR needs to rebase Add a conflict label if PR needs to rebase #611: Commit fbbecf0 pushed by donaldsharp
February 5, 2024 19:17 3s reorg_route_entry
reorg_route_entry
February 5, 2024 19:17 3s