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

Stop an extra `h` being added to leasetime of DHCP server. #1646

Merged
merged 3 commits into from Jul 28, 2017

Conversation

Projects
None yet
2 participants
@PromoFaux
Member

PromoFaux commented Jul 28, 2017

By submitting this pull request, I confirm the following (please check boxes, eg [X]) Failure to fill the template will close your PR:

Please submit all pull requests against the development branch. Failure to do so will delay or deny your request

  • I have read and understood the contributors guide.
  • I have written tests and verified that they fail without my change.
  • I have squashed any insignificant commits.
  • This change has comments for package types, values, functions, and non-obvious lines of code.
  • 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 Signed Off all commits. (git commit --signoff)

Please explain what you have done and wish to accomplish with this Pull Request

  1. What does this change do, exactly?
    Prevents an extra h being added to the DHCP config

  2. Please link to the relevant issues.
    Issue on Discourse

  3. Which documentation changes (if any) need to be made because of this PR?

stop an extra `h` being added to leasetime of DHCP server. We already…
… storethe `h` in `setupVars.conf`

Signed-off-by: Adam Warner <adamw@rner.email>

@PromoFaux PromoFaux requested a review from pi-hole/core-approvers Jul 28, 2017

@Mcat12

Mcat12 approved these changes Jul 28, 2017

LGTM, logic makes sense

Additional check to fix any existing cases of "24h" in setupVars.conf…
… automatically.

Signed-off-by: Adam Warner <adamw@rner.email>

@PromoFaux PromoFaux added this to the v3.2 milestone Jul 28, 2017

@PromoFaux PromoFaux merged commit 106d5af into release/3.2 Jul 28, 2017

4 checks passed

code-review/pullapprove Approved by all reviewer groups.
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details
license/cla Contributor License Agreement is signed.
Details

@PromoFaux PromoFaux deleted the bugfix/DoubleH branch Jul 28, 2017

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