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 ARPFLUSH button on the settings page #1514

Merged
merged 2 commits into from Jul 21, 2020
Merged

Fix ARPFLUSH button on the settings page #1514

merged 2 commits into from Jul 21, 2020

Conversation

DL6ER
Copy link
Member

@DL6ER DL6ER commented Jul 20, 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 #1493

How does this PR accomplish the above?:

Fix incorrect conversion to pihole_execute() wrapper in 39ec678#diff-a93c1ad771067e0f3d2e9dbfb4a62375L716

More details can be found here: #1493 (comment)

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

None

PromoFaux and others added 2 commits July 15, 2020 22:35
@PromoFaux
Merge pull request #1480 from pi-hole/release/v5.1
d8d3f31 
Pi-hole web v5.1
@DL6ER
Fix arpflush command
99adb30 
Signed-off-by: DL6ER <dl6er@dl6er.de>
@DL6ER DL6ER added the Bugfix label Jul 20, 2020
@DL6ER DL6ER requested a review from PromoFaux July 20, 2020 19:40
@DL6ER DL6ER linked an issue Jul 20, 2020 that may be closed by this pull request
Flushing network table in v5.1 gives PHP error #1493
Closed
3 tasks
@DL6ER DL6ER changed the base branch from devel to release/v5.1.1 July 20, 2020 19:46
@DL6ER DL6ER requested a review from XhmikosR July 20, 2020 20:32
@DL6ER DL6ER added this to the v5.1.1 milestone Jul 20, 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/error-network-table/35977/2

@DL6ER DL6ER merged commit 4e8584a into release/v5.1.1 Jul 21, 2020
@DL6ER DL6ER deleted the fix/arpflush branch July 21, 2020 10:52
@PromoFaux PromoFaux mentioned this pull request Jul 24, 2020
Merged
This was referenced Jul 30, 2020
Closed
Closed
@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-ftl-v5-2-released/36964/1

@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/error-when-attempting-pi-hole-update/36986/5

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

@XhmikosR XhmikosR Awaiting requested review from XhmikosR

Assignees
No one assigned
Labels
Bugfix
Projects
None yet
Milestone
v5.1.1
Development

Successfully merging this pull request may close these issues.

Flushing network table in v5.1 gives PHP error
3 participants
@DL6ER @pralor-bot @PromoFaux