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

Fix overwrite of custom configuration #1486

Merged
merged 1 commit into from
Oct 6, 2017

Conversation

aledbf
Copy link
Member

@aledbf aledbf commented Oct 6, 2017

fixes #1479

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Oct 6, 2017
@k8s-reviewable
Copy link

This change is Reviewable

@k8s-ci-robot k8s-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Oct 6, 2017
@aledbf aledbf closed this Oct 6, 2017
@aledbf aledbf reopened this Oct 6, 2017
@coveralls
Copy link

Coverage Status

Coverage remained the same at 43.745% when pulling 50d4124 on aledbf:fix-configuration into 6b80dda on kubernetes:master.

@aledbf aledbf merged commit 48a58bb into kubernetes:master Oct 6, 2017
@aledbf aledbf deleted the fix-configuration branch October 6, 2017 04:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
4 participants