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

Fixing kube-up for CVM masters. #29140

Merged
merged 1 commit into from
Jul 19, 2016
Merged

Fixing kube-up for CVM masters. #29140

merged 1 commit into from
Jul 19, 2016

Conversation

maisem
Copy link

@maisem maisem commented Jul 18, 2016

@foxish
Copy link
Contributor

foxish commented Jul 18, 2016

Labelling this PR as size/S

@zmerlynn
Copy link
Member

@foxish: Are you running an alternate copy of @k8s-merge-robot but not in dry-run mode?

@zmerlynn zmerlynn added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 18, 2016
@k8s-github-robot k8s-github-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. release-note-label-needed labels Jul 18, 2016
@zmerlynn zmerlynn added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed release-note-label-needed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jul 18, 2016
@zmerlynn zmerlynn self-assigned this Jul 18, 2016
@foxish
Copy link
Contributor

foxish commented Jul 18, 2016

Yes I was :( Sorry.

@zmerlynn
Copy link
Member

@foxish: No worries, just confusing. :)

@k8s-github-robot k8s-github-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Jul 18, 2016
@k8s-bot
Copy link

k8s-bot commented Jul 18, 2016

GCE e2e build/test passed for commit fe14340.

@roberthbailey
Copy link
Contributor

lgtm. we may want to cherry pick into 1.3 as well so that we can run cvm masters in the 1.3 branch.

@k8s-cherrypick-bot
Copy link

Removing label cherrypick-candidate because no release milestone was set. This is an invalid state and thus this PR is not being considered for cherry-pick to any release branch. Please add an appropriate release milestone and then re-add the label.

@zmerlynn zmerlynn added this to the v1.3 milestone Jul 18, 2016
@maisem
Copy link
Author

maisem commented Jul 18, 2016

@roberthbailey - that would require to cherrypick #27961 before this.

@roberthbailey
Copy link
Contributor

Good to know. We can cherry pick them as a batch with the script too.

@k8s-github-robot
Copy link

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

@k8s-bot
Copy link

k8s-bot commented Jul 19, 2016

GCE e2e build/test passed for commit fe14340.

@k8s-github-robot
Copy link

Automatic merge from submit-queue

@k8s-github-robot k8s-github-robot merged commit c31882a into kubernetes:master Jul 19, 2016
@maisem maisem deleted the gce_on_cvm branch July 19, 2016 04:37
@fabioy fabioy added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Jul 19, 2016
@maisem maisem mentioned this pull request Jul 20, 2016
Merged
k8s-github-robot pushed a commit that referenced this pull request Aug 2, 2016
Merge pull request #29309 from maisem/automated-cherry-pick-of-#27961-#…
db94921 
…29140-upstream-release-1.3

Automatic merge from submit-queue

Automated cherry pick of #27961 #29140 upstream release 1.3

Cherry pick of #27961 and #29140 on release-1.3.
@k8s-cherrypick-bot
Copy link

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

shyamjvs pushed a commit to shyamjvs/kubernetes that referenced this pull request Dec 1, 2016
Merge pull request kubernetes#29309 from maisem/automated-cherry-pick…
26a63cb 
…-of-#27961-kubernetes#29140-upstream-release-1.3

Automatic merge from submit-queue

Automated cherry pick of kubernetes#27961 kubernetes#29140 upstream release 1.3

Cherry pick of kubernetes#27961 and kubernetes#29140 on release-1.3.
shouhong pushed a commit to shouhong/kubernetes that referenced this pull request Feb 14, 2017
Merge pull request kubernetes#29309 from maisem/automated-cherry-pick…
fb7803a 
…-of-#27961-kubernetes#29140-upstream-release-1.3

Automatic merge from submit-queue

Automated cherry pick of kubernetes#27961 kubernetes#29140 upstream release 1.3

Cherry pick of kubernetes#27961 and kubernetes#29140 on release-1.3.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@zmerlynn zmerlynn

@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/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
v1.3
Development

Successfully merging this pull request may close these issues.
9 participants
@maisem @foxish @zmerlynn @k8s-bot @roberthbailey @k8s-cherrypick-bot @k8s-github-robot @googlebot @fabioy