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
2,242 workflow runs
2,242 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Merge pull request #2121 from pi-hole/fix/binsearch_shm Check for merge conflicts #3036: Commit f130216 pushed by DL6ER
November 18, 2024 18:14 2m 13s development
development
November 18, 2024 18:14 2m 13s
Log error to open /proc/self/status only when in debugging mode and a… Check for merge conflicts #3035: Commit 1a38455 pushed by DL6ER
November 18, 2024 16:41 14s debug/no_fork
debug/no_fork
November 18, 2024 16:41 14s
Remap shared memory lookup tables after they have been resized Check for merge conflicts #3034: Commit 81d06bf pushed by DL6ER
November 18, 2024 16:39 16s fix/binsearch_shm
fix/binsearch_shm
November 18, 2024 16:39 16s
Remap shared memory lookup tables after they have been resized Check for merge conflicts #3033: Commit 341464f pushed by DL6ER
November 17, 2024 20:46 11s debug/no_fork
debug/no_fork
November 17, 2024 20:46 11s
Check if clients are public IP addresses Check for merge conflicts #3032: Commit 79ab06f pushed by DL6ER
November 17, 2024 20:45 10s new/warn_open_resolver
new/warn_open_resolver
November 17, 2024 20:45 10s
Add out-of-bounds check in binsearch() Check for merge conflicts #3031: Commit 59c22db pushed by DL6ER
November 17, 2024 08:32 14s debug/no_fork
debug/no_fork
November 17, 2024 08:32 14s
Add out-of-bounds check in binsearch() Check for merge conflicts #3030: Commit b4bfdcf pushed by DL6ER
November 17, 2024 08:25 10s debug/no_fork
debug/no_fork
November 17, 2024 08:25 10s
Add extra debugging output concerning binsearch (debug.shmem) Check for merge conflicts #3029: Commit b4f194b pushed by DL6ER
November 16, 2024 19:51 10s debug/no_fork
debug/no_fork
November 16, 2024 19:51 10s
Add extra debugging output concerning binsearch (debug.shmem) Check for merge conflicts #3028: Commit c27bff9 pushed by DL6ER
November 16, 2024 19:43 10s debug/no_fork
debug/no_fork
November 16, 2024 19:43 10s
Use the correct counters when resizing lookup tables Check for merge conflicts #3027: Commit 26d1dd3 pushed by DL6ER
November 16, 2024 07:08 9s debug/no_fork
debug/no_fork
November 16, 2024 07:08 9s
Simplify some code and dump all known string periodically to /tmp/str… Check for merge conflicts #3026: Commit 0d7e5ec pushed by DL6ER
November 15, 2024 08:17 20s debug/no_fork
debug/no_fork
November 15, 2024 08:17 20s
Merge pull request #2117 from pi-hole/fix/netlink_close Check for merge conflicts #3025: Commit 988a3c3 pushed by DL6ER
November 14, 2024 17:44 2m 16s development
development
November 14, 2024 17:44 2m 16s
Ensure we close netlink sockets Check for merge conflicts #3024: Commit ca6866c pushed by DL6ER
November 14, 2024 17:24 14s fix/netlink_close
fix/netlink_close
November 14, 2024 17:24 14s
Use libbacktrace for bracktrace generation Check for merge conflicts #3023: Commit e8965ed pushed by DL6ER
November 13, 2024 19:46 11s new/libbacktrace2
new/libbacktrace2
November 13, 2024 19:46 11s
Merge branch 'development' into new/libexecinfo Check for merge conflicts #3022: Commit 451cdcd pushed by DL6ER
November 13, 2024 18:42 12s new/libexecinfo
new/libexecinfo
November 13, 2024 18:42 12s
We also need lzma for unwinding Check for merge conflicts #3021: Commit f7d607d pushed by DL6ER
November 13, 2024 18:36 20s new/unwinding
new/unwinding
November 13, 2024 18:36 20s
Simplify some code and dump all known string periodically to /tmp/str… Check for merge conflicts #3020: Commit 8634059 pushed by DL6ER
November 13, 2024 12:37 12s fix/debugging
fix/debugging
November 13, 2024 12:37 12s
Merge pull request #2116 from pi-hole/fix/validate_revServer Check for merge conflicts #3019: Commit 8b7a843 pushed by DL6ER
November 11, 2024 15:47 2m 16s development
development
November 11, 2024 15:47 2m 16s
Make <domain> optional in dns.revServer Check for merge conflicts #3018: Pull request #2116 synchronize by DL6ER
November 11, 2024 13:29 10s
November 11, 2024 13:29 10s
Adjust the revServer-related CI tests Check for merge conflicts #3017: Commit 0f8f23f pushed by DL6ER
November 11, 2024 13:29 10s fix/validate_revServer
fix/validate_revServer
November 11, 2024 13:29 10s
Make <domain> optional in dns.revServer Check for merge conflicts #3016: Pull request #2116 synchronize by DL6ER
November 11, 2024 12:50 9s
November 11, 2024 12:50 9s
Make <domain> optional in dns.revServer Check for merge conflicts #3015: Commit ada35db pushed by DL6ER
November 11, 2024 12:50 12s fix/validate_revServer
fix/validate_revServer
November 11, 2024 12:50 12s
Make <domain> optional in dns.revServer Check for merge conflicts #3014: Commit 6b2db87 pushed by DL6ER
November 11, 2024 12:44 12s fix/validate_revServer
fix/validate_revServer
November 11, 2024 12:44 12s
Add HTTP/2 support Check for merge conflicts #3013: Pull request #2114 synchronize by DL6ER
November 10, 2024 09:49 9s
November 10, 2024 09:49 9s
Undo some unintended changes and remove unnecessary preprocessor-flags Check for merge conflicts #3012: Commit cf05f3e pushed by DL6ER
November 10, 2024 09:49 10s http2
http2
November 10, 2024 09:49 10s