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

Revert "deps: sync with upstream c-ares/c-ares@4ef6817" #5234

Merged
merged 1 commit into from
Feb 15, 2016

Conversation

bnoordhuis
Copy link
Member

This reverts commit 35c3832.

See [0] and [1] for background. Let's hold off on upgrading c-ares
until upstream makes an official release.

[0] #5185
[1] #5199

R=@indutny

Aside: there isn't a v5.x-staging branch to target?

@bnoordhuis
Copy link
Member Author

I'm not having much luck starting a node-test-pull-request job, the page times out. Have to step out for a bit, will revisit when I'm back. Tests pass locally, FWIW.

@evanlucas
Copy link
Contributor

@mscdex mscdex added c++ Issues and PRs that require attention from people who are familiar with C++. dns Issues and PRs related to the dns subsystem. labels Feb 15, 2016
@MylesBorins
Copy link
Contributor

@bnoordhuis there is no staging to target.

Is the plan to land this on 5.x and then cherry-pick onto master?

@bnoordhuis
Copy link
Member Author

Is the plan to land this on 5.x and then cherry-pick onto master?

No, just land on v5.x. Master isn't (known) broken at the moment, I'm just being cautious with v5.x.

@indutny
Copy link
Member

indutny commented Feb 15, 2016

LGTM

This reverts commit 35c3832.

See [0] and [1] for background.  Let's hold off on upgrading c-ares
until upstream makes an official release.

[0] nodejs#5185
[1] nodejs#5199

PR-URL: nodejs#5199
Reviewed-By: Fedor Indutny <[email protected]>
@bnoordhuis bnoordhuis merged commit 127dd62 into nodejs:v5.x Feb 15, 2016
@bnoordhuis bnoordhuis deleted the revert-cares-upgrade branch February 15, 2016 21:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
c++ Issues and PRs that require attention from people who are familiar with C++. dns Issues and PRs related to the dns subsystem.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants