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

Release 1.2 cherry-picks #22874

Merged
merged 11 commits into from
Mar 11, 2016
Merged

Release 1.2 cherry-picks #22874

merged 11 commits into from
Mar 11, 2016

Conversation

eparis
Copy link
Contributor

@eparis eparis commented Mar 11, 2016

This PR includes cherrypicks of the following:
#22846: Fix AWS default master sizes
#22666: Fix flake in pod IP as env var e2e
#22853: allow resource.version.group in kubectl
#21535: restore ability to run against secured etcd
#22410: Deprecating --api-version flag
#22564: Update DNS document to talk about the new Pod and Endpoints Annotations to set hostname
#22727: Guarantee we finish writing to the test log before the test exits.
#22802: Close streams with Reset instead of Close when closing streaming connections
#22865: prevent disallowed secret refs from leaking via the downward API
#22862: fix typo in kubectl run help string

k8s-merge-robot and others added 11 commits March 11, 2016 15:53
@eparis
Merge pull request kubernetes#22846 from wojtek-t/fix_master_size
6fb503a 
Auto commit by PR queue bot
@bgrant0607 @eparis
Merge pull request kubernetes#22666 from pmorie/pod-ip-flake-redux
5d09316 
Fix flake in pod IP as env var e2e
@bgrant0607 @eparis
Merge pull request kubernetes#22853 from deads2k/parse-version
a0566b8 
allow resource.version.group in kubectl
@bgrant0607 @eparis
Merge pull request kubernetes#21535 from AdoHe/restore_secure_etcd
d106abd 
restore ability to run against secured etcd
@bgrant0607 @eparis
Merge pull request kubernetes#22410 from nikhiljindal/apiReferenceFlag
302dac1 
Deprecating --api-version flag

Conflicts in printing.go with HEAD->release-1.2
Conflicts in generated docs with that and timestamp
@bgrant0607 @eparis
Merge pull request kubernetes#22564 from ArtfulCoder/dnsdoc
ef3e704 
Update DNS document to talk about the new Pod and Endpoints Annotations to set hostname
@bgrant0607 @eparis
Merge pull request kubernetes#22727 from mml/racey
f9762c0 
Guarantee we finish writing to the test log before the test exits.
@bgrant0607 @eparis
Merge pull request kubernetes#22802 from ncdc/httpstream-reset-stream…
279ad2f 
…s-when-closing-connection

Close streams with Reset instead of Close when closing streaming connections
@bgrant0607 @eparis
Merge pull request kubernetes#22865 from deads2k/fix-downward-api-leak
30d6098 
prevent disallowed secret refs from leaking via the downward API
@bgrant0607 @eparis
Merge pull request kubernetes#22862 from jlowdermilk/typo
69fdbf2 
fix typo in kubectl run help string
@eparis
Versionize docs after cherry-picks
27f5a58
@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.

@bgrant0607 bgrant0607 self-assigned this Mar 11, 2016
@bgrant0607
Copy link
Member

cc @david-mcmahon

@bgrant0607
Copy link
Member

Thanks much. LGTM

@bgrant0607 bgrant0607 added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 11, 2016
@bgrant0607 bgrant0607 added this to the v1.2 milestone Mar 11, 2016
@bgrant0607
Copy link
Member

Will merge once tests pass.

@k8s-github-robot
Copy link

Labelling this PR as size/XS

@k8s-github-robot k8s-github-robot added kind/old-docs size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Mar 11, 2016
@bgrant0607
Copy link
Member

Hmm. Travis build timed out

@bgrant0607 bgrant0607 closed this Mar 11, 2016
@bgrant0607 bgrant0607 reopened this Mar 11, 2016
@bgrant0607
Copy link
Member

Failed build was:
https://travis-ci.org/kubernetes/kubernetes/builds/115417980

Closed and re-opened to try again.

@k8s-bot
Copy link

k8s-bot commented Mar 11, 2016

GCE e2e build/test passed for commit 27f5a58.

@bgrant0607
Copy link
Member

Travis passed 2nd time

@bgrant0607
Copy link
Member

All green. Merging.

bgrant0607 added a commit that referenced this pull request Mar 11, 2016
@bgrant0607
Merge pull request #22874 from eparis/release-1.2
a7cc501 
Release 1.2 cherry-picks
@bgrant0607 bgrant0607 merged commit a7cc501 into kubernetes:release-1.2 Mar 11, 2016
@lavalamp
Copy link
Member

Thanks for making these pick PRs, @eparis. This is tons better than what we did last time.

This was referenced Mar 11, 2016
Merged
Merged
Merged
Merged
Merged
Merged
Merged
Merged
Merged
Merged
shyamjvs pushed a commit to shyamjvs/kubernetes that referenced this pull request Dec 1, 2016
@bgrant0607
Merge pull request kubernetes#22874 from eparis/release-1.2
93e8b5c 
Release 1.2 cherry-picks
shouhong pushed a commit to shouhong/kubernetes that referenced this pull request Feb 14, 2017
@bgrant0607
Merge pull request kubernetes#22874 from eparis/release-1.2
137b9a5 
Release 1.2 cherry-picks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@bgrant0607 bgrant0607

Labels
lgtm "Looks good to me", indicates that a PR is ready to be merged. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Milestone
v1.2
Development

Successfully merging this pull request may close these issues.
7 participants
@eparis @googlebot @bgrant0607 @k8s-github-robot @k8s-bot @lavalamp @k8s-teamcity-mesosphere