Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Pi-hole FTL v5.8.1 #1116

Merged
merged 8 commits into from Apr 21, 2021
Merged

Pi-hole FTL v5.8.1 #1116

merged 8 commits into from Apr 21, 2021

Conversation

DL6ER
Copy link
Member

@DL6ER DL6ER commented Apr 19, 2021

Pi-hole FTL hotfix release

DL6ER and others added 8 commits April 15, 2021 10:23
@DL6ER
Fix database update to version 7 reporting error when there is none. …
dfb09a3 
…This is not a critical bug as the issue resolves itself on the next start of FTL.

Signed-off-by: DL6ER <dl6er@dl6er.de>
@DL6ER
Test: Add test for "database not available" messages indicating faile…
45ebdf9 
…d database updates and creations.

Signed-off-by: DL6ER <dl6er@dl6er.de>
@DL6ER
Merge pull request #1110 from pi-hole/master
f40dfe0 
Sync development
@DL6ER
Give threads a bit more time to reach a point where cancellation is s…
f72962c 
…afe. We cannot give them too much time because, otherwise, the proces trying to TERMinate FTL may decide to KILL it instead. We should avoid this to be able to properly cleanup.

Signed-off-by: DL6ER <dl6er@dl6er.de>
@DL6ER
Merge pull request #1108 from pi-hole/fix/database_update_v7
a72294c 
Fix database update to version 7 reporting error
@DL6ER
Merge pull request #1112 from pi-hole/fix/database_threads
42ddb6e 
Give threads a bit more time to shut down properly
@DL6ER
Don't try to terminate threads when we never launched them.
1ad6f5b 
Signed-off-by: DL6ER <dl6er@dl6er.de>
@DL6ER
Merge pull request #1115 from pi-hole/fix/crash_on_fatal_dnsmasq
d429598 
Don't try to terminate threads when we never launched them
@DL6ER DL6ER added the Release label Apr 19, 2021
@DL6ER DL6ER added this to the v5.8.1 milestone Apr 19, 2021
@dschaper
Copy link
Member

Do we need a release/v5.8.1 branch?

@DL6ER
Copy link
Member Author

DL6ER commented Apr 20, 2021

Release branches before the tag on master never pick up the latter. Hence, an FTL version built on the release/v5.8.1 branch still shows vDev-12-v5.8 (intermediate version). The solution can be either to merge the tagged master commit into the release branch after releasing it - or - to create the branch only after we merged into master. Or - leave the branch entirely (because users will always be able to check out a specific version using a tag).

@PromoFaux PromoFaux merged commit b90ab8b into master Apr 21, 2021
jps3 added a commit to jps3/balena-pihole that referenced this pull request Apr 24, 2021
@jps3
pihole: update to release v5.8.1
30d23e0 
https://github.com/pi-hole/docker-pi-hole/releases/tag/v5.8.1
pi-hole/FTL#1116
@renovate renovate bot mentioned this pull request Mar 7, 2022
Open
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@PromoFaux PromoFaux PromoFaux approved these changes

@dschaper dschaper dschaper approved these changes

Assignees
No one assigned
Labels
Release
Projects
None yet
Milestone
v5.8.1
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@DL6ER @dschaper @PromoFaux