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

UPSTREAM: 44462: 44489: fix selfLink for cluster-scoped resources #14001

Merged
merged 1 commit into from
May 3, 2017

Conversation

ncdc
Copy link
Contributor

@ncdc ncdc commented May 2, 2017

This is a manual backport of the 2 kube PRs, as upstream has refactored a bit since 1.6.

We can drop this patch in the rebase to 1.7.

Fixes #12553
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1428707

cc @deads2k @sttts @liggitt @stefwalter

We can drop this patch in the rebase to 1.7.
@ncdc
Copy link
Contributor Author

ncdc commented May 2, 2017

[test]

@ncdc ncdc added this to the 3.6.0 milestone May 2, 2017
@openshift-bot
Copy link
Contributor

Evaluated for origin test up to 35a04fb

@deads2k
Copy link
Contributor

deads2k commented May 2, 2017

lgtm [merge]

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pull_request_origin/1088/) (Base Commit: 8cb8f29)

martinpitt added a commit to martinpitt/cockpit that referenced this pull request May 2, 2017
Regression in Openshift 1.5 in Fedora/CentOS/RHEL:
cockpit-project#6381
This is being fixed in openshift/origin#14001.

This breaks Cockpit's Openshift interface really hard, but nevertheless
1.5 is what is delivered to the world now.
@ncdc
Copy link
Contributor Author

ncdc commented May 3, 2017

#13942 [merge]

@openshift-bot
Copy link
Contributor

Evaluated for origin merge up to 35a04fb

@openshift-bot
Copy link
Contributor

openshift-bot commented May 3, 2017

continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/merge_pull_request_origin/542/) (Base Commit: 59948c6) (Image: devenv-rhel7_6203)

@openshift-bot openshift-bot merged commit bea9588 into openshift:master May 3, 2017
stefwalter pushed a commit to cockpit-project/cockpit that referenced this pull request May 3, 2017
Regression in Openshift 1.5 in Fedora/CentOS/RHEL:
#6381
This is being fixed in openshift/origin#14001.

This breaks Cockpit's Openshift interface really hard, but nevertheless
1.5 is what is delivered to the world now.

Closes #6398
Reviewed-by: Stef Walter <[email protected]>
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