Skip to content

Actions: pi-hole/FTL

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
merge-conflict.yml
1,397 workflow run results
1,397 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Add DHCPv6 probing to dhcp-discover tool Check for merge conflicts #3078: Pull request #2128 synchronize by DL6ER
December 9, 2024 19:44 11s
December 9, 2024 19:44 11s
Remove now obsolete variable Check for merge conflicts #3077: Commit 70e0087 pushed by DL6ER
December 9, 2024 19:44 11s new/dhcpv6
new/dhcpv6
December 9, 2024 19:44 11s
Add DHCPv6 probing to dhcp-discover tool Check for merge conflicts #3076: Pull request #2128 synchronize by DL6ER
December 9, 2024 19:43 9s
December 9, 2024 19:43 9s
Simplify final output Check for merge conflicts #3075: Commit c412b22 pushed by DL6ER
December 9, 2024 19:43 13s new/dhcpv6
new/dhcpv6
December 9, 2024 19:43 13s
Add DHCPv6 probing to dhcp-discover tool Check for merge conflicts #3074: Pull request #2128 synchronize by DL6ER
December 9, 2024 19:39 16s
December 9, 2024 19:39 16s
Consolidate DHCP and RA answers per interface Check for merge conflicts #3073: Commit 437fea3 pushed by DL6ER
December 9, 2024 19:39 12s new/dhcpv6
new/dhcpv6
December 9, 2024 19:39 12s
Add error handling to capabilities functions Check for merge conflicts #3072: Commit e657fbc pushed by DL6ER
December 9, 2024 12:03 12s new/alpine_v3.21
new/alpine_v3.21
December 9, 2024 12:03 12s
Update changed Intel i386 notation in binary classification test Check for merge conflicts #3071: Commit c277d2a pushed by DL6ER
December 9, 2024 11:48 15s new/alpine_v3.21
new/alpine_v3.21
December 9, 2024 11:48 15s
Update changed Intel i386 notation in binary classification test Check for merge conflicts #3070: Commit c277d2a pushed by DL6ER
December 9, 2024 09:55 13s special/CI_development
special/CI_development
December 9, 2024 09:55 13s
Remove debugger attaching - it stops FTL being able to start on recen… Check for merge conflicts #3069: Commit 8e2505e pushed by DL6ER
December 9, 2024 09:38 13s special/CI_development
special/CI_development
December 9, 2024 09:38 13s
Interchange the arguments for calloc(numer_of_elements, element_size)… Check for merge conflicts #3068: Commit 137ac13 pushed by DL6ER
December 9, 2024 09:24 10s special/CI_development
special/CI_development
December 9, 2024 09:24 10s
Interchange the arguments for calloc(numer_of_elements, element_size)… Check for merge conflicts #3067: Commit fee5502 pushed by DL6ER
December 9, 2024 09:15 15s special/CI_development
special/CI_development
December 9, 2024 09:15 15s
Merge pull request #2132 from pi-hole/update/sqlite_3.47.2 Check for merge conflicts #3066: Commit 18f91b0 pushed by DL6ER
December 9, 2024 08:48 11s special/CI_development
special/CI_development
December 9, 2024 08:48 11s
Merge pull request #2132 from pi-hole/update/sqlite_3.47.2 Check for merge conflicts #3065: Commit 18f91b0 pushed by DL6ER
December 8, 2024 06:45 2m 10s development
development
December 8, 2024 06:45 2m 10s
Merge pull request #2131 from pi-hole/fix/123 Check for merge conflicts #3064: Commit f4a209a pushed by DL6ER
December 8, 2024 06:40 2m 11s development
development
December 8, 2024 06:40 2m 11s
Update embedded SQLite3 to 3.47.2 Check for merge conflicts #3063: Commit fb2bfbf pushed by DL6ER
December 8, 2024 06:17 14s update/sqlite_3.47.2
update/sqlite_3.47.2
December 8, 2024 06:17 14s
Fix duplicated code and silence a harmless warning Check for merge conflicts #3062: Commit d7b77b3 pushed by DL6ER
December 8, 2024 06:13 12s fix/123
fix/123
December 8, 2024 06:13 12s
Delay IPv6 client name lookups Check for merge conflicts #3061: Commit 2fc84ec pushed by DL6ER
December 6, 2024 17:06 16s tweak/delay_v6_names
tweak/delay_v6_names
December 6, 2024 17:06 16s
Add DHCPv6 probing to dhcp-discover tool Check for merge conflicts #3060: Pull request #2128 synchronize by DL6ER
December 5, 2024 19:51 11s
December 5, 2024 19:51 11s
Minor improvements Check for merge conflicts #3059: Commit 87a2ad5 pushed by DL6ER
December 5, 2024 19:51 10s new/dhcpv6
new/dhcpv6
December 5, 2024 19:51 10s
Merge pull request #2127 from pi-hole/tweak/dynamic_GCinterval Check for merge conflicts #3058: Commit 707280c pushed by DL6ER
December 5, 2024 18:21 2m 15s development
development
December 5, 2024 18:21 2m 15s
Scan for DHCP and RA in parallel at the same time to shorten the over… Check for merge conflicts #3057: Commit 7b1fc5e pushed by DL6ER
December 5, 2024 18:16 12s new/dhcpv6
new/dhcpv6
December 5, 2024 18:16 12s
Circumvent a warning from inside sys/socket.h preventing clang from c… Check for merge conflicts #3056: Commit 85d2e7f pushed by DL6ER
December 4, 2024 18:01 11s new/dhcpv6
new/dhcpv6
December 4, 2024 18:01 11s
Circumvent a warning from inside sys/socket.h preventing clang from c… Check for merge conflicts #3055: Commit 55c5305 pushed by DL6ER
December 4, 2024 17:54 11s new/dhcpv6
new/dhcpv6
December 4, 2024 17:54 11s
Add DHCPv6 probing for pihole-FTL dhcp-discover Check for merge conflicts #3054: Commit 5497d9c pushed by DL6ER
December 4, 2024 16:45 14s new/dhcpv6
new/dhcpv6
December 4, 2024 16:45 14s