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

Tweak NTP error reporting Check for merge conflicts #3104: Pull request #2125 synchronize by DL6ER
December 21, 2024 07:40 11s
December 21, 2024 07:40 11s
Reduce time accuracy requirements for NTP service to 0.5 seconds (com… Check for merge conflicts #3103: Commit bc67a9f pushed by DL6ER
December 21, 2024 07:40 10s tweak/ntp_errors
tweak/ntp_errors
December 21, 2024 07:40 10s
Add new explicit migration command. This is intentionally not include… Check for merge conflicts #3102: Commit 1b50c69 pushed by DL6ER
December 21, 2024 06:23 11s fix/migration
fix/migration
December 21, 2024 06:23 11s
Tweak NTP error reporting Check for merge conflicts #3101: Pull request #2125 synchronize by DL6ER
December 20, 2024 19:03 12s
December 20, 2024 19:03 12s
Dynamically reduce retry interval of NTP client in case the first syn… Check for merge conflicts #3100: Commit c002dc2 pushed by DL6ER
December 20, 2024 19:03 15s tweak/ntp_errors
tweak/ntp_errors
December 20, 2024 19:03 15s
Make webserver ports optional by default Check for merge conflicts #3099: Commit 11249c1 pushed by DL6ER
December 20, 2024 09:01 13s new/optional_webports
new/optional_webports
December 20, 2024 09:01 13s
Add new 'o' (optional) port modifier now allowed in api.webserver.por… Check for merge conflicts #3098: Commit 582d7f1 pushed by DL6ER
December 20, 2024 08:14 11s update/civetweb
update/civetweb
December 20, 2024 08:14 11s
Update dnsmasq version to most recent tag v2.91test1 Check for merge conflicts #3097: Commit 9ac0ba2 pushed by DL6ER
December 19, 2024 09:02 12s update/dnsmasq
update/dnsmasq
December 19, 2024 09:02 12s
Tweak NTP error reporting Check for merge conflicts #3095: Pull request #2125 synchronize by DL6ER
December 19, 2024 08:39 10s
December 19, 2024 08:39 10s
Do not try to obtain -1 ID pointer in CNAME code to prevent harmless … Check for merge conflicts #3094: Commit 747b899 pushed by DL6ER
December 19, 2024 08:39 11s tweak/ntp_errors
tweak/ntp_errors
December 19, 2024 08:39 11s
Tweak NTP error reporting Check for merge conflicts #3093: Pull request #2125 synchronize by DL6ER
December 18, 2024 19:42 14s
December 18, 2024 19:42 14s
Ensure NTP port can be re-bound even after fast successive restarts Check for merge conflicts #3092: Commit cf2c7c3 pushed by DL6ER
December 18, 2024 19:42 12s tweak/ntp_errors
tweak/ntp_errors
December 18, 2024 19:42 12s
Expose EDE information via API if available Check for merge conflicts #3091: Commit dd39c5e pushed by DL6ER
December 18, 2024 09:58 11s new/queries_ede
new/queries_ede
December 18, 2024 09:58 11s
Expose EDE information via API if available Check for merge conflicts #3090: Commit 026b071 pushed by DL6ER
December 18, 2024 09:32 14s new/queries_ede
new/queries_ede
December 18, 2024 09:32 14s
Tweak NTP error reporting Check for merge conflicts #3089: Pull request #2125 synchronize by DL6ER
December 17, 2024 20:34 16s
December 17, 2024 20:34 16s
Minor further enhancements for NTP code Check for merge conflicts #3088: Commit 9cd1137 pushed by DL6ER
December 17, 2024 20:34 14s tweak/ntp_errors
tweak/ntp_errors
December 17, 2024 20:34 14s
Tweak NTP error reporting Check for merge conflicts #3087: Pull request #2125 synchronize by DL6ER
December 17, 2024 20:16 18s
December 17, 2024 20:16 18s
Improve error checking in several functions of resolve.c Check for merge conflicts #3086: Commit 5af65fc pushed by DL6ER
December 17, 2024 20:16 18s tweak/ntp_errors
tweak/ntp_errors
December 17, 2024 20:16 18s
Tweak NTP error reporting Check for merge conflicts #3085: Pull request #2125 synchronize by DL6ER
December 13, 2024 20:04 12s
December 13, 2024 20:04 12s
Do not fork when handling NTP replies Check for merge conflicts #3084: Commit a76e791 pushed by DL6ER
December 13, 2024 20:04 12s tweak/ntp_errors
tweak/ntp_errors
December 13, 2024 20:04 12s
Merge pull request #2133 from pi-hole/new/alpine_v3.21 Check for merge conflicts #3083: Commit 91ea8d4 pushed by DL6ER
December 10, 2024 18:38 2m 12s development
development
December 10, 2024 18:38 2m 12s
GCC 14.2.0 support Check for merge conflicts #3082: Pull request #2133 synchronize by DL6ER
December 9, 2024 20:30 11s
December 9, 2024 20:30 11s
Update builder Check for merge conflicts #3081: Commit d10354e pushed by DL6ER
December 9, 2024 20:30 12s new/alpine_v3.21
new/alpine_v3.21
December 9, 2024 20:30 12s
Add DHCPv6 probing to dhcp-discover tool Check for merge conflicts #3080: Pull request #2128 synchronize by DL6ER
December 9, 2024 19:48 36s
December 9, 2024 19:48 36s
Consolidate DHCP and RA answers per interface Check for merge conflicts #3079: Commit 57c155c pushed by DL6ER
December 9, 2024 19:48 37s new/dhcpv6
new/dhcpv6
December 9, 2024 19:48 37s