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.

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

Improve conditional forwarding #3260

Merged
merged 6 commits into from
Jun 21, 2020
Merged

Improve conditional forwarding #3260

merged 6 commits into from
Jun 21, 2020

Conversation

DL6ER
Copy link
Member

@DL6ER DL6ER commented Apr 9, 2020

By submitting this pull request, I confirm the following:

  • I have read and understood the contributors guide, as well as this entire template.
  • I have made only one major change in my proposed changes.
  • I have commented my proposed changes within the code.
  • I have tested my proposed changes, and have included unit tests where possible.
  • I am willing to help maintain this change if there are issues with it later.
  • I give this submission freely and claim no ownership.
  • It is compatible with the EUPL 1.2 license
  • I have squashed any insignificant commits. (git rebase)

What does this PR aim to accomplish?:

Improve conditional forwarding

How does this PR accomplish the above?:

Necessary backend changes with automatic conversion of existing legavy settings into the new format. More details may be found in pi-hole/web#1208

What documentation changes (if any) are needed to support this PR?:

None

…intended CIDR range automatically.

Signed-off-by: DL6ER <dl6er@dl6er.de>
Signed-off-by: DL6ER <dl6er@dl6er.de>
@DL6ER DL6ER added this to the v5.1 milestone Apr 9, 2020
@DL6ER DL6ER requested a review from a team April 9, 2020 07:29
Signed-off-by: DL6ER <dl6er@dl6er.de>
@PromoFaux
Copy link
Member

What is the status on this please?

@DL6ER
Copy link
Member Author

DL6ER commented Jun 4, 2020

@PromoFaux Merged in the most recent changes, resolved all conflicts. I think this is good to go.

… The code does now preserve legacy behavior and users can open up the subnet manually if they like.

Signed-off-by: DL6ER <dl6er@dl6er.de>
@dschaper dschaper merged commit 3aaf9d8 into development Jun 21, 2020
@dschaper dschaper deleted the new/rev-server branch June 21, 2020 20:26
@PromoFaux PromoFaux mentioned this pull request Jul 5, 2020
@pralor-bot
Copy link

This pull request has been mentioned on Pi-hole Userspace. There might be relevant details there:

https://discourse.pi-hole.net/t/pi-hole-5-1-released/35577/1

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants