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

[bug]fix the appending bug #33163

Merged
merged 1 commit into from
Sep 22, 2016
Merged

[bug]fix the appending bug #33163

merged 1 commit into from
Sep 22, 2016

Conversation

DjangoPeng
Copy link
Contributor

@DjangoPeng DjangoPeng commented Sep 21, 2016 •
edited by jessfraz
Loading

Fix the DOCKER_OPTS appending bug. Reference the issue#33124

Fix the DOCKER_OPTS appending bug.

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.

While we transition away from the Jenkins GitHub PR Builder plugin, "ok to test" commenters will need to be on the admin list defined in this file.

@DjangoPeng DjangoPeng changed the title fix the appending bug [bug]fix the appending bug Sep 21, 2016
@k8s-github-robot k8s-github-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. release-note-label-needed labels Sep 21, 2016
@roberthbailey
Copy link
Contributor

@DjangoPeng does this need to be cherry picked into the 1.4 branch?

@roberthbailey roberthbailey added lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note-none Denotes a PR that doesn't merit a release note. and removed release-note-label-needed labels Sep 21, 2016
@DjangoPeng
Copy link
Contributor Author

@roberthbailey That's fine, because it's a general bug. BTW, why not merge it into master branch directly?

@roberthbailey
Copy link
Contributor

Reviewed 1 of 1 files at r1.
Review status: all files reviewed at latest revision, all discussions resolved.

Comments from Reviewable

@roberthbailey
Copy link
Contributor

The cherry pick process is described in https://github.com/kubernetes/kubernetes/blob/master/docs/devel/cherry-picks.md. If you want to backport this bug fix to 1.4, you wait until it merges into master and then send a second pull request against the release branch.

@k8s-github-robot
Copy link

@k8s-bot test this [submit-queue is verifying that this PR is safe to merge]

@k8s-github-robot
Copy link

Automatic merge from submit-queue

@k8s-github-robot k8s-github-robot merged commit 6d08910 into kubernetes:master Sep 22, 2016
@DjangoPeng
Copy link
Contributor Author

DjangoPeng commented Sep 23, 2016 •
edited
Loading

@roberthbailey I think it need to be cherry picked into 1.4 branch at the same time. As I said above, it's a general bug in the kube-up.sh. Everytime people install the k8s may cause the same problem if they download the 1.4 without the fix.

@roberthbailey roberthbailey added this to the v1.4 milestone Sep 23, 2016
@roberthbailey
Copy link
Contributor

I've set the appropriate tags; please run the script to create the cherry pick pull request.

@DjangoPeng
Copy link
Contributor Author

I'll do it later, cause I can't push code into github in my company.

@DjangoPeng
Copy link
Contributor Author

@roberthbailey I have run the script

@jessfraz
Copy link
Contributor

jessfraz commented Oct 6, 2016

@DjangoPeng can you ping me on the PR

@jessfraz jessfraz added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Oct 6, 2016
@jessfraz jessfraz mentioned this pull request Oct 6, 2016
Merged
@jessfraz jessfraz added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed release-note-none Denotes a PR that doesn't merit a release note. labels Oct 6, 2016
k8s-github-robot pushed a commit that referenced this pull request Oct 6, 2016
Merge pull request #34266 from jessfraz/automated-cherry-pick-of-#32914-
f579ae7 
#33163-#33227-#33359-#33605-#33967-#33977-#34158-origin-release-1.4

Automatic merge from submit-queue

Automated cherry pick of #32914 #33163 #33227 #33359 #33605 #33967 #33977 #34158 origin release 1.4

Cherry pick of #32914 #33163 #33227 #33359 #33605 #33967 #33977 #34158 on release-1.4.

#32914: Limit the number of names per image reported in the node
#33163: fix the appending bug
#33227: remove cpu limits for dns pod. The current limits are not
#33359: Fix goroutine leak in federation service controller
#33605: Add periodic ingress reconciliations.
#33967: scheduler: cache.delete deletes the pod from node specified
#33977: Heal the namespaceless ingresses in federation e2e.
#34158: Add missing argument to log message in federated ingress
@k8s-cherrypick-bot
Copy link

Commit found in the "release-1.4" branch appears to be this PR. Removing the "cherrypick-candidate" label. If this is an error find help to get your PR picked.

@DjangoPeng
Copy link
Contributor Author

@jessfraz Sorry, I have just finished my vacation. I saw that you have picked it, thx~

shyamjvs pushed a commit to shyamjvs/kubernetes that referenced this pull request Dec 1, 2016
Merge pull request kubernetes#34266 from jessfraz/automated-cherry-pi…
cc6193b 
…ck-of-#32914-kubernetes#33163-kubernetes#33227-kubernetes#33359-kubernetes#33605-kubernetes#33967-kubernetes#33977-kubernetes#34158-origin-release-1.4

Automatic merge from submit-queue

Automated cherry pick of kubernetes#32914 kubernetes#33163 kubernetes#33227 kubernetes#33359 kubernetes#33605 kubernetes#33967 kubernetes#33977 kubernetes#34158 origin release 1.4

Cherry pick of kubernetes#32914 kubernetes#33163 kubernetes#33227 kubernetes#33359 kubernetes#33605 kubernetes#33967 kubernetes#33977 kubernetes#34158 on release-1.4.

kubernetes#32914: Limit the number of names per image reported in the node
kubernetes#33163: fix the appending bug
kubernetes#33227: remove cpu limits for dns pod. The current limits are not
kubernetes#33359: Fix goroutine leak in federation service controller
kubernetes#33605: Add periodic ingress reconciliations.
kubernetes#33967: scheduler: cache.delete deletes the pod from node specified
kubernetes#33977: Heal the namespaceless ingresses in federation e2e.
kubernetes#34158: Add missing argument to log message in federated ingress
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@roberthbailey roberthbailey

Labels
cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. 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/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Milestone
v1.4
Development

Successfully merging this pull request may close these issues.
7 participants
@DjangoPeng @k8s-ci-robot @roberthbailey @k8s-github-robot @jessfraz @k8s-cherrypick-bot @googlebot