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

Cherry-picks for release 1.2 - 24 Mar #23450

Merged
merged 18 commits into from
Mar 24, 2016

Conversation

eparis
Copy link
Contributor

@eparis eparis commented Mar 24, 2016

#22960: Trusty: support developer workflow on base image
#22974: MESOS: forward globally declared cadvisor housekeeping flags
#23035: #23034 Fix controller-manager race condition issue which cause endpoints flush during restart
#23143: Validate minimum CPU limits to be >= 10m
#23167: Add a SSHKey sync check to the master's healthz (when using SSHTunnels).
#23141: kubelet: send all recevied pods in one update
#23145: Use versioned object when computing patch
#23222: Add a Deployment example for kubectl expose.
#23019: Add a rate limiter to the GCE cloudprovider
#23246: update expose command description to add deployment
#23079: Trusty: Support hybrid cluster with nodes on ContainerVM
#23160: Copy annotations back from RS to Deployment on rollback
#23180: Remove the restart-kube-proxy and restart-apiserver functions
#23313: Bump to container-vm-v20160321
#23325: Fix hairpin mode
#23234: Removing URL query param from swagger UI to fix the XSS issue
#23305: Update kubectl help for 1.2 resources
#22818: Trusty: Avoid reaching GCE custom metadata size limit

k8s-merge-robot added 18 commits March 24, 2016 16:55
Auto commit by PR queue bot
(cherry picked from commit 5cc2bb3)
…ekeeping-flags

Auto commit by PR queue bot
(cherry picked from commit 68892a3)
Auto commit by PR queue bot
(cherry picked from commit cda4583)
Auto commit by PR queue bot
(cherry picked from commit 78adb88)
Auto commit by PR queue bot
(cherry picked from commit 10204f8)
Auto commit by PR queue bot
(cherry picked from commit 61b9a21)
Auto commit by PR queue bot
(cherry picked from commit 6239907)
…deployment-example

Auto commit by PR queue bot
(cherry picked from commit 2c5903a)
Auto commit by PR queue bot
(cherry picked from commit 0fe049f)
Auto commit by PR queue bot
(cherry picked from commit b077b68)
Auto commit by PR queue bot
(cherry picked from commit d5316c2)
…ation

Auto commit by PR queue bot
(cherry picked from commit edc35bf)
Auto commit by PR queue bot
(cherry picked from commit f2d1499)
Auto commit by PR queue bot
(cherry picked from commit 4d98abf)
Auto commit by PR queue bot
(cherry picked from commit 8f71655)
…lQuery

Auto commit by PR queue bot
(cherry picked from commit b50e89e)
Auto commit by PR queue bot
(cherry picked from commit 2f89867)
Auto commit by PR queue bot
(cherry picked from commit f8bb10b)
@googlebot
Copy link

We found a Contributor License Agreement for you (the sender of this pull request), but were unable to find agreements for the commit author(s). If you authored these, maybe you used a different email address in the git commits than was used to sign the CLA (login here to double check)? If these were authored by someone else, then they will need to sign a CLA as well, and confirm that they're okay with these being contributed to Google.

@eparis eparis added this to the v1.2 milestone Mar 24, 2016
@eparis eparis added cherrypick-candidate cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. labels Mar 24, 2016
@eparis
Copy link
Contributor Author

eparis commented Mar 24, 2016

The script let me down a bit, so I did it like I did for 1.2.0. Will work with @zmerlynn before the next batch to use the script.

@k8s-github-robot
Copy link

Labelling this PR as size/XXL

@k8s-github-robot k8s-github-robot added kind/design Categorizes issue or PR as related to design. kind/old-docs size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Mar 24, 2016
@bgrant0607
Copy link
Member

Thanks.

What happened with "#23035: #23034" ?

@eparis
Copy link
Contributor Author

eparis commented Mar 24, 2016

I also posted #22835 (comment) for the one approved PR which was not able to be easily/mechanically included.

@bgrant0607
Copy link
Member

Oh, that's the title. Weird. Nevermind.

@eparis
Copy link
Contributor Author

eparis commented Mar 24, 2016

I had to double check that, it is actually the title!

@bgrant0607
Copy link
Member

Ok, looks like everything is there.

I labeled all of these PRs with "release-note".

Waiting for tests to pass.

cc @david-mcmahon @roberthbailey

@k8s-bot
Copy link

k8s-bot commented Mar 24, 2016

GCE e2e build/test passed for commit 3e9daa2.

@bgrant0607
Copy link
Member

Green. Merging.

@bgrant0607 bgrant0607 merged commit 8934b5d into kubernetes:release-1.2 Mar 24, 2016
@k8s-cherrypick-bot
Copy link

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

@bgrant0607
Copy link
Member

The bot unmarked this PR. :-)

@bgrant0607
Copy link
Member

Ok, great. #22835 was the only PR not unlabeled. Cool.

@jayunit100 jayunit100 mentioned this pull request Apr 12, 2016
shyamjvs pushed a commit to shyamjvs/kubernetes that referenced this pull request Dec 1, 2016
Cherry-picks for release 1.2 - 24 Mar
shouhong pushed a commit to shouhong/kubernetes that referenced this pull request Feb 14, 2017
Cherry-picks for release 1.2 - 24 Mar
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. kind/design Categorizes issue or PR as related to design. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants