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

Fix issue with Adding Local DNS Records does not add to /etc/pihole/custom.list when using grep 3.10 #5269

Merged
merged 1 commit into from May 27, 2023
Merged

Fix issue with Adding Local DNS Records does not add to /etc/pihole/custom.list when using grep 3.10 #5269

merged 1 commit into from May 27, 2023

Conversation

MrDuck2742
Copy link
Contributor

Fixes #5268

@rdwebdesign
Copy link
Member

Can you please sign off your commit to satisfy the DCO bot requirement?

@yubiuser
Copy link
Member

yubiuser commented May 6, 2023

Thanks for your PR. It contains 4 commits, but only the last one contains your changes. It seems, you started from an older development base branch. Please update your base branch and rebase your commit.

@yubiuser yubiuser linked an issue May 6, 2023 that may be closed by this pull request
Adding Local DNS Records does not add to /etc/pihole/custom.list #5268
Closed
@MrDuck2742 MrDuck2742 changed the base branch from development to development-v6 May 6, 2023 20:51
@MrDuck2742 MrDuck2742 changed the base branch from development-v6 to development May 6, 2023 20:54
@MrDuck2742 MrDuck2742 changed the base branch from development to development-v6 May 6, 2023 21:14
@MrDuck2742 MrDuck2742 changed the base branch from development-v6 to development May 6, 2023 21:15
@github-actions github-actions bot added the PR: Merge Conflict Issue blocking check and merge of code label May 6, 2023
@github-actions
Copy link

github-actions bot commented May 6, 2023

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@MrDuck2742 MrDuck2742 changed the base branch from development to development-v6 May 6, 2023 22:07
@MrDuck2742 MrDuck2742 changed the base branch from development-v6 to development May 6, 2023 22:07
@yubiuser
Copy link
Member

yubiuser commented May 6, 2023

development is the branch you want.

@github-actions
Copy link

github-actions bot commented May 6, 2023

Conflicts have been resolved.

@github-actions github-actions bot removed the PR: Merge Conflict Issue blocking check and merge of code label May 6, 2023
@MrDuck2742
Copy link
Contributor Author

MrDuck2742 commented May 6, 2023 •
edited

Sorry about all the changes! Just getting to grips with Git ... should be good now.

@MrDuck2742
Copy link
Contributor Author

ok ... about ... now :o)

@PromoFaux PromoFaux changed the title MrDuck2742/issue5268 Fix issue with Adding Local DNS Records does not add to /etc/pihole/custom.list when using grep 3.10 May 7, 2023
@yubiuser yubiuser requested a review from PromoFaux May 7, 2023 10:58
@MrDuck2742
Adding Local DNS Records does not add to /etc/pihole/custom.list
b8c3f6d 
Fixes #5268

Signed-off-by: MrDuck2742 <jim@datachord.co.uk>
@MrDuck2742
Copy link
Contributor Author

Just signed with GPG key ... should all be good now ...

@PromoFaux PromoFaux merged commit 82b60b0 into pi-hole:development May 27, 2023
16 checks passed
@DL6ER DL6ER mentioned this pull request May 28, 2023
Merged
@MrDuck2742 MrDuck2742 deleted the MrDuck2742/issue5268 branch May 28, 2023 12:13
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

@yubiuser yubiuser yubiuser approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Adding Local DNS Records does not add to /etc/pihole/custom.list
4 participants
@MrDuck2742 @rdwebdesign @yubiuser @PromoFaux