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

Fix masterCA conversion #5051

Merged
merged 1 commit into from
Oct 10, 2015
Merged

Fix masterCA conversion #5051

merged 1 commit into from
Oct 10, 2015

Conversation

liggitt
Copy link
Contributor

@liggitt liggitt commented Oct 10, 2015

Fixes #5050

@liggitt
Copy link
Contributor Author

liggitt commented Oct 10, 2015

@deads2k PTAL

@liggitt
Copy link
Contributor Author

liggitt commented Oct 10, 2015

[test]

@liggitt
Copy link
Contributor Author

liggitt commented Oct 10, 2015

race #5025

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pull_requests_origin/5630/)

@openshift-bot
Copy link
Contributor

Evaluated for origin test up to 33fb12b

@liggitt
Copy link
Contributor Author

liggitt commented Oct 10, 2015

[merge] to fix master, will take comments as follow up

@liggitt
Copy link
Contributor Author

liggitt commented Oct 10, 2015

race #5025

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/merge_pull_requests_origin/3566/) (Image: devenv-fedora_2458)

@openshift-bot
Copy link
Contributor

Evaluated for origin merge up to 33fb12b

openshift-bot pushed a commit that referenced this pull request Oct 10, 2015
@openshift-bot openshift-bot merged commit 5082e04 into openshift:master Oct 10, 2015
@liggitt liggitt deleted the oauth_master_ca branch October 10, 2015 20:04
package api

func init() {
Scheme.AddDefaultingFuncs(
Copy link
Contributor

Choose a reason for hiding this comment

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

I didn't catch this in the previous review. Defaulters belong to versions. This would need to be in the v1/conversions.go with the rest of the defaulters.

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.

3 participants