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 PADD -> FTL communication #149

Merged
merged 2 commits into from
Dec 30, 2020
Merged

Fix PADD -> FTL communication #149

merged 2 commits into from
Dec 30, 2020

Conversation

DL6ER
Copy link
Member

@DL6ER DL6ER commented Dec 30, 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?:

Fix #147

How does this PR accomplish the above?:

Merge the same fix as in pi-hole/pi-hole#3954

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

None

@DL6ER DL6ER added the Bugfix label Dec 30, 2020
@DL6ER DL6ER requested a review from dschaper December 30, 2020 10:24
@DL6ER DL6ER changed the title Update PADD -> FTL communication as done in pi-hole/pi-hole#3954 Fix PADD -> FTL communication Dec 30, 2020
@dschaper
Copy link
Member

Can you update line 20 to v3.5? Thanks!

@DL6ER
Update version string
f5a1649 
Signed-off-by: DL6ER <dl6er@dl6er.de>
@DL6ER
Copy link
Member Author

DL6ER commented Dec 30, 2020

@dschaper Done

@dschaper dschaper merged commit 649d67c into master Dec 30, 2020
@dschaper dschaper deleted the fix/chronometer_connection_reset branch December 30, 2020 21:06
dschaper pushed a commit that referenced this pull request Dec 31, 2020
@christianboyle @DL6ER
Revert IPv4 variable change made in commit 4203be5 (#132)
ef5acdc 
* Revert IPv4 variable change made in commit 4203be5

* Version bump 3.4 -> 3.4.1

* Fix PADD -> FTL communication (#149)

* Update PADD -> FTL communication as done in pi-hole/pi-hole#3954

* Update version string

* Version bump 3.5 -> 3.5.1

Co-authored-by: DL6ER <DL6ER@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dschaper dschaper Awaiting requested review from dschaper

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

Successfully merging this pull request may close these issues.

pihole-ftl v.5.3.4 / PADD v3.4 - telnet_connection_handler_thread
2 participants
@DL6ER @dschaper