Merge lp:~cjwatson/charms/precise/squid-forwardproxy/dns-v4-first into lp:~canonical-launchpad-branches/charms/precise/squid-forwardproxy/trunk
Proposed by
Colin Watson
Status: | Merged | ||||
---|---|---|---|---|---|
Merged at revision: | 40 | ||||
Proposed branch: | lp:~cjwatson/charms/precise/squid-forwardproxy/dns-v4-first | ||||
Merge into: | lp:~canonical-launchpad-branches/charms/precise/squid-forwardproxy/trunk | ||||
Diff against target: |
26 lines (+8/-0) 2 files modified
config.yaml (+4/-0) templates/main_config.template (+4/-0) |
||||
To merge this branch: | bzr merge lp:~cjwatson/charms/precise/squid-forwardproxy/dns-v4-first | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
William Grant | Approve | ||
Review via email: mp+354316@code.launchpad.net |
Commit message
Add dns_v4_first configuration option.
Description of the change
PS4.5 doesn't have IPv6 yet, so Squid's default of preferring IPv6 addresses fails.
To post a comment you must log in.