2 Commits

Author	SHA1	Message	Date
Kubernetes Publisher	03ecb9f167	Merge pull request #58317 from nikhita/bump-go-yaml ... 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>. bump(670d4c): gopkg.in/yaml.v2: fix parsing for non-specific tags Fixes #56976 Fixes this bug - https://github.com/go-yaml/yaml/issues/75 - in `go-yaml`. The fix for this bug is at 670d4cfef0. **Release note**: ```release-note NONE ``` /cc sttts caesarxuchao jennybuckley Kubernetes-commit: 4e2c3f060a873a0b727dbd3e66047a3b2858db97	2018-02-06 05:35:22 +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