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 recent CA server changes #1855

Merged
merged 2 commits into from Jan 10, 2017

Conversation

aaronlehmann
Copy link
Collaborator

This reverts #1841 and #1854.

ca unit tests appear to be hanging in CI runs against master. It's either because of these changes or #1851. Unfortunately I can't reproduce the problem locally. #1851 has passed CI several times, so I'm starting by trying to revert #1841 / #1854. If these turn out to be the problem, I'll figure out what's going on later, and open a fixed PR with that change.

This reverts commit 6f5c777.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
This reverts commit 65de375.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
@cyli
Copy link
Contributor

cyli commented Jan 10, 2017

Sorry. :| This all looked like reasonable changes. +1

@aaronlehmann aaronlehmann merged commit 7dfafd8 into moby:master Jan 10, 2017
@aaronlehmann aaronlehmann deleted the revert-ca-server-changes branch January 10, 2017 20:06
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.

None yet

2 participants