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

Collapse onto upstream authentication types where possible #14007

Merged
merged 3 commits into from
May 6, 2017
Merged

Collapse onto upstream authentication types where possible #14007

merged 3 commits into from
May 6, 2017

Conversation

deads2k
Copy link
Contributor

@deads2k deads2k commented May 2, 2017

I've done a first pass of duplicate authentication types with upstream. I called out x509 separately, since upstream doesn't respect user UID on certs. I don't think we care. If we do, we should update upstream.

@liggitt @ncdc @enj

@deads2k
Copy link
Contributor Author

deads2k commented May 2, 2017

[test]

@openshift-bot openshift-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 3, 2017
@deads2k
Copy link
Contributor Author

deads2k commented May 3, 2017

@liggitt if you're ok losing the x509 user UID ability (not done upstream), the rest of this review can be @enj

@deads2k deads2k force-pushed the auth-10-collapse branch from faf2c9c to da0fc90 Compare May 3, 2017 19:34
@liggitt
Copy link
Contributor

liggitt commented May 3, 2017

@liggitt if you're ok losing the x509 user UID ability (not done upstream)

I am

@deads2k deads2k assigned enj and unassigned liggitt May 3, 2017
@deads2k
Copy link
Contributor Author

deads2k commented May 3, 2017

@enj please review.

@deads2k deads2k removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 3, 2017
@deads2k
Copy link
Contributor Author

deads2k commented May 4, 2017

#14043

re[test]

@deads2k
Copy link
Contributor Author

deads2k commented May 4, 2017

#14048 re[test]

@openshift-bot openshift-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 5, 2017
@deads2k deads2k force-pushed the auth-10-collapse branch from da0fc90 to fbc00f3 Compare May 5, 2017 13:08
@openshift-bot
Copy link
Contributor

Evaluated for origin test up to fbc00f3

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pull_request_origin/1194/) (Base Commit: 076d231)

@openshift-bot openshift-bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 5, 2017
@enj
Copy link
Contributor

enj commented May 5, 2017

[merge]

@openshift-bot
Copy link
Contributor

Evaluated for origin merge up to fbc00f3

@openshift-bot
Copy link
Contributor

openshift-bot commented May 6, 2017 •
edited
Loading

continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/merge_pull_request_origin/579/) (Base Commit: 26ca5c9) (Image: devenv-rhel7_6215)

@openshift-bot openshift-bot merged commit 2eff920 into openshift:master May 6, 2017
@deads2k deads2k deleted the auth-10-collapse branch August 3, 2017 19:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@enj enj

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@deads2k @liggitt @openshift-bot @enj