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

Fix unbound shortcut links #1404

Closed
wants to merge 9 commits into from
Closed

Fix unbound shortcut links #1404

wants to merge 9 commits into from

Conversation

phil-davis
Copy link
Contributor

Fixes redmine #4151

  1. Make the naming in shortcuts.inc more clear - forwarder=dnsmasq resolver=unbound
  2. Make the value of $shortcuts_section correct in each dnsmasq and unbound php code
  3. Make diag_logs_resolver.php smarter, so if dnsmasq is enabled, then show shortcuts for dnsmasq, otherwise show shortcuts for unbound.
  4. Fix some references to forwarder in unbound code - should be resolver.

@jim-p
Copy link
Contributor

jim-p commented Dec 27, 2014

This all looks good but is there any way you could resubmit this as one single commit, or make a pull request for both master and RELENG_2_2? It's much easier to merge or cherry-pick that way.

@phil-davis
Copy link
Contributor Author

I do all this stuff online in GitHub. The online editor does not seem to let you save without commit, so I end up with a commit for every file change. I will make a matching pull request for RELENG_2_2 and have at look at using some local Git where I can make edits and then a single commit...

@phil-davis
Copy link
Contributor Author

Closing in favor of #1405 which will be easier to commit and merge to RELENG_2_2.

@phil-davis phil-davis closed this Dec 28, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants