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.

Sign up for GitHub

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

Jump to bottom

fix broken cluster/centos and enhance the style #34002

Merged
merged 1 commit into from
Dec 10, 2016
Merged

fix broken cluster/centos and enhance the style #34002

merged 1 commit into from
Dec 10, 2016

Conversation

xiaoping378
Copy link
Contributor

@xiaoping378 xiaoping378 commented Oct 4, 2016 •
edited by k8s-oncall
Loading

replace the PR #33818

This change is Reviewable

@k8s-ci-robot
Copy link
Contributor

Can a kubernetes member verify that this patch is reasonable to test? If so, please reply with "@k8s-bot ok to test" on its own line.

Regular contributors should join the org to skip this step.

@xiaoping378 xiaoping378 mentioned this pull request Oct 4, 2016
Closed
@k8s-github-robot k8s-github-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. release-note-label-needed labels Oct 4, 2016
@roberthbailey roberthbailey assigned roberthbailey and unassigned eparis Oct 4, 2016
@xiaoping378
Copy link
Contributor Author

xiaoping378 commented Oct 5, 2016 •
edited
Loading

Hi @roberthbailey
i must sign up to contribute to this project as an employee for cla/linuxfoundation ?
cla/linuxfoundation is ok...

@roberthbailey
Copy link
Contributor

@zmerlynn can you take a look at this today?

@k8s-github-robot k8s-github-robot added the do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. label Nov 10, 2016
@apelisse apelisse removed the do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. label Nov 11, 2016
@zmerlynn zmerlynn added retest-not-required release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed release-note-label-needed labels Nov 21, 2016
@zmerlynn
Copy link
Member

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 21, 2016
@mikedanese
Copy link
Member

@k8s-bot bazel test this, issue kubernetes/test-infra#1152

@rmmh
Copy link
Contributor

rmmh commented Dec 8, 2016

@k8s-bot test this

@k8s-ci-robot
Copy link
Contributor

Jenkins verification failed for commit ef213c5. Full PR test history.

The magic incantation to run this job again is @k8s-bot verify test this. Please help us cut down flakes by linking to an open flake issue when you hit one in your PR.

@k8s-ci-robot
Copy link
Contributor

Jenkins GCE e2e failed for commit ef213c5. Full PR test history.

The magic incantation to run this job again is @k8s-bot cvm gce e2e test this. Please help us cut down flakes by linking to an open flake issue when you hit one in your PR.

@rmmh
Copy link
Contributor

rmmh commented Dec 9, 2016

@xiaoping378 looks like one of the copyrights is wrong

I1208 10:15:21.421] Verifying hack/make-rules/../../hack/verify-boilerplate.sh
I1208 10:15:22.567] Boilerplate header is wrong for: /go/src/k8s.io/kubernetes/cluster/centos/master/scripts/flannel.sh
I1208 10:15:22.569] FAILED hack/make-rules/../../hack/verify-boilerplate.sh 1s

@xiaoping378
Copy link
Contributor Author

@rmmh
should I run hack/update-generated-docs.sh ?
and add a commit ?

@rmmh
Copy link
Contributor

rmmh commented Dec 9, 2016

No. hack/verify-boilerplate.sh should show tell you what's wrong-- I think you might just have an extra line (and the wrong year) in the copyright in flannel.sh.

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Dec 9, 2016
rmmh
rmmh reviewed Dec 9, 2016
View reviewed changes
cluster/centos/master/scripts/flannel.sh
@@ -60,5 60,6 @@ while true; do
done
wait

systemctl enable flannel
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

intentional?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, need it.
ok i will squash the two commits

@rmmh
Copy link
Contributor

rmmh commented Dec 9, 2016

feel free to squash your commits

@k8s-github-robot k8s-github-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Dec 9, 2016
@xiaoping378
fix broken cluster/centos and enhance the style
ae1c0e6 
run hack/verify-boilerplate.sh, fix the Copyright
@xiaoping378
Copy link
Contributor Author

Just run

git rebase -i HEAD~2
git push -f

@rmmh rmmh added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Dec 10, 2016
@k8s-ci-robot
Copy link
Contributor

Jenkins CRI GCE Node e2e failed for commit ae1c0e6. Full PR test history.

The magic incantation to run this job again is @k8s-bot cri node e2e test this. Please help us cut down flakes by linking to an open flake issue when you hit one in your PR.

@k8s-ci-robot
Copy link
Contributor

Jenkins CRI GCE e2e failed for commit ae1c0e6. Full PR test history.

The magic incantation to run this job again is @k8s-bot cri e2e test this. Please help us cut down flakes by linking to an open flake issue when you hit one in your PR.

@k8s-github-robot
Copy link

Automatic merge from submit-queue

@k8s-github-robot k8s-github-robot merged commit c2aaac9 into kubernetes:master Dec 10, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rmmh rmmh rmmh left review comments

Assignees

@zmerlynn zmerlynn

Labels
cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
10 participants
@xiaoping378 @k8s-ci-robot @roberthbailey @zmerlynn @mikedanese @rmmh @k8s-github-robot @apelisse @googlebot @eparis