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 #22855

Merged
merged 26 commits into from
Mar 11, 2016
Merged

Conversation

eparis
Copy link
Contributor

@eparis eparis commented Mar 11, 2016

This picks the following PRs:
#22430: Change scheduler logic from random to round-robin
#22709: enable master kubelet in gce-default to match gce-test
#22708: Take 2: continuously delete pods on nodes that don't exist
#22720: Don't list master node when looking to a NodePort node.
#22748: MESOS: fix broken km controller
#22749: Selector operator strings should all be lowercase to be consistent with other operators.
#22743: Make kubelet-perf 100 pod/node test work with registered master
#22606: Modify deployment.go to use nginx:1.73 and redis:e2e
#22769: Pass ResourceVersion in Scale object back to RC before updating RC so that it can be used to check for conflicts.
#22594: Ubernetes-Lite: reuse existing configuration when reusing master
#22762: Added job/v1 generator to kubectl run
#22801: Bumped Heapster to v0.20.0-alpha12
#22017: Fix thirdparty discovery and add unit tests
#22808: Copy replicaset example yamls to hack/testdata directory.
#22766: Fix validation of resources (cpu, memory, storage) for limit range types.
#22809: Add kubectl describe tests for replica sets.
#22811: Enable kubectl autoscale for replica sets.
#22756: MESOS: added proxy-kubeconfig flag
#22772: update wide option output
#22840: Prefer fetched version when determining HPA group version kind

The next two had conflicts which were solved by hand
#22724: Support for both map-based and set-based selectors in extensions/v1beta1.Scale
#22758: ReplicaSetSpec.Template shouldn't be a pointer.

And then 2 more that came in after I started.
#22804: bump(github.com/docker/spdystream): 449fdfce4d962303d702fec724ef0ad181c92528
#22849: Added api discovery to kubectl run, based on which we decide which generators to use

And then 1 which I guess I just missed!
#22602: Ubernetes Lite: apply auto-labels to dynamically provisioned volumes

k8s-merge-robot and others added 20 commits March 11, 2016 10:48
…erator-cases

Auto commit by PR queue bot
Make kubelet-perf 100 pod/node test work with registered master
…ges-validation-fix

Auto commit by PR queue bot
Prefer fetched version when determining HPA group version kind
@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
Copy link
Contributor Author

eparis commented Mar 11, 2016

@bgrant0607

@k8s-github-robot
Copy link

Labelling this PR as size/XXL

@k8s-github-robot k8s-github-robot added kind/old-docs size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Mar 11, 2016
@bgrant0607 bgrant0607 assigned bgrant0607 and unassigned ikehz Mar 11, 2016
This was referenced Mar 11, 2016
@bgrant0607
Copy link
Member

All green. Merging.

bgrant0607 added a commit that referenced this pull request Mar 11, 2016
Cherry-picks for release 1.2
@bgrant0607 bgrant0607 merged commit becf778 into kubernetes:release-1.2 Mar 11, 2016
shyamjvs pushed a commit to shyamjvs/kubernetes that referenced this pull request Dec 1, 2016
shouhong pushed a commit to shouhong/kubernetes that referenced this pull request Feb 14, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/api-change Categorizes issue or PR as related to adding, removing, or otherwise changing an API lgtm "Looks good to me", indicates that a PR is ready to be merged. 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