Skip to content

Actions: pi-hole/docker-pi-hole

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
merge-conflict.yml
838 workflow runs
838 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Always terminate the container if pihole-FTL binary exits Check for merge conflicts #1012: Pull request #1649 synchronize by PromoFaux
October 9, 2024 18:09 17s
October 9, 2024 18:09 17s
Monitor the capsh pid, not FTL pid. If stop is called without an exit… Check for merge conflicts #1011: Commit 931b216 pushed by PromoFaux
October 9, 2024 18:09 25s terminate-with-FTL
terminate-with-FTL
October 9, 2024 18:09 25s
Always terminate the container if pihole-FTL binary exits Check for merge conflicts #1010: Pull request #1649 synchronize by PromoFaux
October 9, 2024 17:38 9s
October 9, 2024 17:38 9s
Monitor the capsh pid, not FTL pid. If stop is called without an exit… Check for merge conflicts #1009: Commit e640e08 pushed by PromoFaux
October 9, 2024 17:38 10s terminate-with-FTL
terminate-with-FTL
October 9, 2024 17:38 10s
Update src/start.sh Check for merge conflicts #1008: Commit 2c8ed88 pushed by PromoFaux
October 9, 2024 08:23 13s terminate-with-FTL
terminate-with-FTL
October 9, 2024 08:23 13s
Always terminate the container if pihole-FTL binary exits Check for merge conflicts #1007: Pull request #1649 synchronize by PromoFaux
October 9, 2024 08:23 9s
October 9, 2024 08:23 9s
Always terminate the container if pihole-FTL binary exits Check for merge conflicts #1006: Pull request #1649 synchronize by PromoFaux
October 9, 2024 08:23 10s
October 9, 2024 08:23 10s
Update src/start.sh Check for merge conflicts #1005: Commit 08017ac pushed by PromoFaux
October 9, 2024 08:23 17s terminate-with-FTL
terminate-with-FTL
October 9, 2024 08:23 17s
Always terminate the container if pihole-FTL binary exits Check for merge conflicts #1004: Pull request #1649 synchronize by PromoFaux
October 8, 2024 20:47 9s
October 8, 2024 20:47 9s
Don't return from the Stop` function early (causes code 143). Shut do… Check for merge conflicts #1003: Commit b5ab72e pushed by PromoFaux
October 8, 2024 20:47 10s terminate-with-FTL
terminate-with-FTL
October 8, 2024 20:47 10s
Update src/start.sh Check for merge conflicts #1002: Commit f9b6999 pushed by PromoFaux
October 7, 2024 22:10 10s terminate-with-FTL
terminate-with-FTL
October 7, 2024 22:10 10s
Always terminate the container if pihole-FTL binary exits Check for merge conflicts #1001: Pull request #1649 synchronize by PromoFaux
October 7, 2024 22:10 12s
October 7, 2024 22:10 12s
Always terminate the container if pihole-FTL binary exits Check for merge conflicts #1000: Pull request #1649 synchronize by PromoFaux
October 7, 2024 20:55 10s
October 7, 2024 20:55 10s
Clean up the code - at the end of the start() function, wait for the… Check for merge conflicts #999: Commit 9e37aa8 pushed by PromoFaux
October 7, 2024 20:55 13s terminate-with-FTL
terminate-with-FTL
October 7, 2024 20:55 13s
Always terminate the container if pihole-FTL binary exits Check for merge conflicts #998: Pull request #1649 synchronize by PromoFaux
October 7, 2024 20:48 11s
October 7, 2024 20:48 11s
Clean up the code - at the end of the start() function, wait for the… Check for merge conflicts #997: Commit 5336f3d pushed by PromoFaux
October 7, 2024 20:48 13s terminate-with-FTL
terminate-with-FTL
October 7, 2024 20:48 13s
Always terminate the container if pihole-FTL binary exits Check for merge conflicts #996: Pull request #1649 synchronize by PromoFaux
October 6, 2024 21:49 9s
October 6, 2024 21:49 9s
Always terminate the container if pihole-FTL binary exits. Either nat… Check for merge conflicts #995: Commit 210a117 pushed by PromoFaux
October 6, 2024 21:49 10s terminate-with-FTL
terminate-with-FTL
October 6, 2024 21:49 10s
Always terminate the container if pihole-FTL binary exits. Either nat… Check for merge conflicts #994: Commit c762e72 pushed by PromoFaux
October 6, 2024 21:39 13s terminate-with-FTL
terminate-with-FTL
October 6, 2024 21:39 13s
Always terminate the container if pihole-FTL binary exists. Either na… Check for merge conflicts #993: Commit c5aac25 pushed by PromoFaux
October 6, 2024 21:39 11s terminate-with-FTL
terminate-with-FTL
October 6, 2024 21:39 11s
Tweak README text and formatting Check for merge conflicts #992: Pull request #1646 synchronize by rdwebdesign
September 25, 2024 16:26 11s
September 25, 2024 16:26 11s
Merge branch 'development' into tweak/README_v6 Check for merge conflicts #991: Commit ba5d35d pushed by rdwebdesign
September 25, 2024 16:26 11s tweak/README_v6
tweak/README_v6
September 25, 2024 16:26 11s
Correct the documentation for the TAIL_FTL_LOG variable Check for merge conflicts #990: Commit 89eb7f6 pushed by PromoFaux
September 25, 2024 14:28 2m 13s development
development
September 25, 2024 14:28 2m 13s
Merge pull request #1648 from pi-hole/dependabot/pip/test/development… Check for merge conflicts #989: Commit 5f3b829 pushed by yubiuser
September 14, 2024 10:52 2m 12s development
development
September 14, 2024 10:52 2m 12s
Bump pytest from 8.3.2 to 8.3.3 in /test Check for merge conflicts #988: Commit 3070e68 pushed by dependabot bot
September 14, 2024 10:51 10s dependabot/pip/test/development/pytest-8.3.3
dependabot/pip/test/development/pytest-8.3.3
September 14, 2024 10:51 10s