Skip to content

[NSError] Use Error for user info providers to match the Darwin version #833

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

Merged
merged 1 commit into from
Jan 25, 2017

Conversation

ikesyo
Copy link
Member

@ikesyo ikesyo commented Jan 24, 2017

No description provided.

@parkera
Copy link
Contributor

parkera commented Jan 24, 2017

@swift-ci please test and merge

@ikesyo
Copy link
Member Author

ikesyo commented Jan 25, 2017

Base branch was modified. Review and try the merge again.

Just a merge error.

@parkera parkera merged commit 51205ff into swiftlang:master Jan 25, 2017
@parkera
Copy link
Contributor

parkera commented Jan 25, 2017

Hm, something mysterious happened to the build after I merged this, #828, and #827. I'm going to revert while we investigate.

@ikesyo
Copy link
Member Author

ikesyo commented Feb 2, 2017

@parkera I'm not sure what was the reason for the failure, but can those reverted PRs be re-reverted now?

@parkera
Copy link
Contributor

parkera commented Feb 2, 2017

Sure - can you put up another PR so we can kick off a test-and-merge?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants