2 Commits

Author	SHA1	Message	Date
Kubernetes Publisher	e4d1759a29	Merge pull request #60373 from sttts/sttts-1.10-cfssl ... Automatic merge from submit-queue (batch tested with PRs 60373, 61098, 61352, 61359, 61362). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Bump cfssl to be compatible with Go 1.10 Kubernetes-commit: ef3539e69e4c897f48ecd6b2dd73417ce0416b08	2018-03-22 07:31:04 +00:00
Kubernetes Publisher	ec723b2112	Merge pull request #52753 from munnerz/sample-controller ... Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. sample-controller: add example CRD controller **What this PR does / why we need it**: Adds a sample-controller example repository fixes #52752 **Special notes for your reviewer**: This is currently based on the sttts:sttts-codegen-scripts branch and should not be merged until that is (ref https://github.com/kubernetes/kubernetes/pull/52186) **Release note**: ``` Add sample-controller repository ``` /cc @sttts @nikhita @colemickens Kubernetes-commit: 9a7800f7d2efb88b397674672ac56f898826cf7c	2017-10-26 12:35:59 +00:00