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

Only specify net::HostResolverSource::DNS when DoH is enabled (uplift to 1.22.x) #8288

Merged
merged 1 commit into from
Mar 19, 2021
Merged

Only specify net::HostResolverSource::DNS when DoH is enabled (uplift to 1.22.x) #8288

merged 1 commit into from
Mar 19, 2021

Conversation

brave-builds
Copy link
Collaborator

@brave-builds brave-builds commented Mar 18, 2021 •
edited by kjozwiak
Loading

Uplift of #8279
Resolves brave/brave-browser#14755

Pre-approval checklist:

  • You have tested your change on Nightly.
  • This contains text which needs to be translated.
    • There are more than 7 days before the release.
    • I've notified folks in #l10n on Slack that translations are needed.
  • The PR milestones match the branch they are landing to.

Pre-merge checklist:

  • You have checked CI and the builds, lint, and tests all pass or are not related to your PR.

Post-merge checklist:

  • The associated issue milestone is set to the smallest version that the changes is landed on.

@brave-builds brave-builds requested a review from iefremov as a code owner March 18, 2021 16:23
@brave-builds brave-builds requested a review from a team March 18, 2021 16:23
@brave-builds brave-builds self-assigned this Mar 18, 2021
@brave-builds brave-builds added this to the 1.22.x - Release milestone Mar 18, 2021
@kjozwiak
Copy link
Member

pre-init failed pylint-report as per https://ci.brave.com/job/pr-brave-browser-pr8279_cname-adblock-doh_1.22.x-pre-init/1/execution/node/136/log/. However, this is a known issue which was fixed via #8222 and uplifted into 1.22.x via #8298. Failure isn't specific to this PR and doesn't block uplift.

post-init failed audit_deps as per https://ci.brave.com/job/pr-brave-browser-pr8279_cname-adblock-doh_1.22.x-post-init/1/execution/node/144/log/ which is a known issue and not related to this PR. Some of the failures were fixed via #8276. Failure isn't specific to this PR and doesn't block uplift.

kjozwiak
kjozwiak approved these changes Mar 19, 2021
View reviewed changes
Copy link
Member

@kjozwiak kjozwiak left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Uplift into 1.22.x approved after deliberating with @brave/uplift-approvers. QA has verified the PR on Nightly as per #8279 (comment).

@kjozwiak kjozwiak merged commit 27cf5ef into 1.22.x Mar 19, 2021
@kjozwiak kjozwiak deleted the pr8279_cname-adblock-doh_1.22.x branch March 19, 2021 06:35
@kjozwiak kjozwiak mentioned this pull request Mar 19, 2021
Closed
bsclifton added a commit that referenced this pull request Mar 23, 2021
@bsclifton
Revert "Merge pull request #8288 from brave/pr8279_cname-adblock-doh_…
5f2fb48 
…1.22.x"

This reverts commit 27cf5ef, reversing
changes made to e104d7c.
bsclifton added a commit that referenced this pull request Mar 23, 2021
@bsclifton
Revert "Merge pull request #8288 from brave/pr8279_cname-adblock-doh_…
f20e8ba 
…1.22.x"

Fixes brave/brave-browser#14721 for 1.22.x

Problem still in `1.23.x` and `master` branches

Auditor: @darkdh

This reverts commit 27cf5ef, reversing
changes made to e104d7c.
@bsclifton
Copy link
Member

Reverted in 1.22.x with f20e8ba

darkdh added a commit that referenced this pull request Mar 24, 2021
@darkdh
Revert "Revert "Merge pull request #8288 from brave/pr8279_cname-adbl…
dc25648 
…ock-doh_1.22.x""

This reverts commit f20e8ba.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kjozwiak kjozwiak kjozwiak approved these changes

@iefremov iefremov Awaiting requested review from iefremov iefremov is a code owner

Assignees

@brave-builds brave-builds

Labels
None yet
Projects
None yet
Milestone
1.22.x - Release
Development

Successfully merging this pull request may close these issues.
4 participants
@brave-builds @kjozwiak @bsclifton @brave-browser-releases