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

Protect against nil panic in apply #15066

Merged
merged 1 commit into from
Jul 7, 2017

Conversation

fabianofranz
Copy link
Member

Fixes #15017
Cherry-picks kubernetes/kubernetes#48481

@liggitt PTAL

@fabianofranz
Copy link
Member Author

[test]

@openshift-bot
Copy link
Contributor

Evaluated for origin test up to 063b275

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pull_request_origin/2994/) (Base Commit: a294495) (PR Branch Commit: 063b275)

@smarterclayton
Copy link
Contributor

LGTM although weird that helper and clientFunc initialized in two different places with two different clients

@fabianofranz
Copy link
Member Author

Ok, I'll [ḿerge] since it's related to a blocker and improve the upstream PR, so when we rebase we get it improved.

@fabianofranz
Copy link
Member Author

Actually
[merge][severity: blocker]

@openshift-bot
Copy link
Contributor

Evaluated for origin merge up to 063b275

@openshift-bot
Copy link
Contributor

openshift-bot commented Jul 7, 2017

continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/merge_pull_request_origin/1247/) (Base Commit: 41a97d2) (PR Branch Commit: 063b275) (Extended Tests: blocker) (Image: devenv-rhel7_6427)

@openshift-bot openshift-bot merged commit 83efc33 into openshift:master Jul 7, 2017
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