Commit Graph

26900 Commits (76369c42bef25fce1dc596f3bac44620a4cc8b10)

Author SHA1 Message Date
k8s-merge-robot 76369c42be Merge pull request #22939 from resouer/util-sub-dir
Auto commit by PR queue bot
2016-03-23 03:34:33 -07:00
k8s-merge-robot 2777cd7e75 Merge pull request #23295 from hongchaodeng/error
Auto commit by PR queue bot
2016-03-23 02:27:36 -07:00
k8s-merge-robot da58256187 Merge pull request #23328 from wojtek-t/conversions_with_framework_2
Auto commit by PR queue bot
2016-03-23 01:48:21 -07:00
k8s-merge-robot 3257260657 Merge pull request #23293 from pwittrock/update-serve-hostname-version
Auto commit by PR queue bot
2016-03-23 01:48:19 -07:00
Wojciech Tyczynski 7394721d5f Use preexisting conversions in generator 2016-03-23 08:40:54 +01:00
k8s-merge-robot 6441e1fc33 Merge pull request #23280 from pweil-/limitrange-supportsfunc
Auto commit by PR queue bot
2016-03-22 22:00:47 -07:00
k8s-merge-robot 8fe4a6e2ed Merge pull request #23193 from sdminonne/bug_fix
Auto commit by PR queue bot
2016-03-22 21:15:58 -07:00
k8s-merge-robot 4af38b52b9 Merge pull request #22736 from resouer/fix-util-dev
Auto commit by PR queue bot
2016-03-22 19:54:58 -07:00
k8s-merge-robot 2f89867821 Merge pull request #23305 from janetkuo/update-kubectl-help
Auto commit by PR queue bot
2016-03-22 19:17:45 -07:00
k8s-merge-robot 6313e15be1 Merge pull request #23351 from maclof/remove-etcd-config-reference
Auto commit by PR queue bot
2016-03-22 16:00:03 -07:00
k8s-merge-robot b04f27c3be Merge pull request #23136 from spxtr/slow-1-1
Auto commit by PR queue bot
2016-03-22 16:00:01 -07:00
Q-Lee 1f8773ee45 Merge pull request #22893 from Q-Lee/nanny-heapster
Support addon Deployments, make heapster a deployment with a nanny.
2016-03-22 14:38:58 -07:00
k8s-merge-robot 9dfbcae449 Merge pull request #22634 from kargakis/kubectl-edit-error-log-fix
Auto commit by PR queue bot
2016-03-22 14:37:55 -07:00
Janet Kuo e93b855242 Update kubectl help for 1.2 resources 2016-03-22 14:14:35 -07:00
Marc Lough b6252cb9fc Update generated docs 2016-03-22 20:55:55 +00:00
Quintin Lee 81ba98ae5d Adding e2e test support for monitoring deployments. 2016-03-22 13:17:06 -07:00
Quintin Lee 0c22277020 Use the same constants as heapster for the heapster nanny. 2016-03-22 13:17:06 -07:00
Quintin Lee c484563315 Removing versions from deployment names. 2016-03-22 13:17:06 -07:00
Quintin Lee 79f0cc25e8 Support addon Deployments, make heapster a deployment with a nanny. 2016-03-22 13:17:06 -07:00
Marc Lough 27c6224abe The --etcd-config option has been removed from kube-apiserver so also remove the mention about it. 2016-03-22 20:14:48 +00:00
k8s-merge-robot b50e89e323 Merge pull request #23234 from nikhiljindal/swaggerRemoveurlQuery
Auto commit by PR queue bot
2016-03-22 11:47:40 -07:00
k8s-merge-robot 8f71655bcc Merge pull request #23325 from MurgaNikolay/master
Auto commit by PR queue bot
2016-03-22 11:47:38 -07:00
k8s-merge-robot c262c81a51 Merge pull request #23274 from wojtek-t/speedup_scheduler_spreading
Auto commit by PR queue bot
2016-03-22 11:00:48 -07:00
nikhiljindal 532398afb3 Remove url query param that is leading to XSS issue 2016-03-22 10:35:06 -07:00
k8s-merge-robot d124deeb2f Merge pull request #23272 from wojtek-t/conversion_generator_with_framework
Auto commit by PR queue bot
2016-03-22 08:42:58 -07:00
Hongchao Deng 189ce6e397 storage: add custom storage error 2016-03-22 08:19:16 -07:00
k8s-merge-robot e2f4141bb3 Merge pull request #23249 from fejta/hackcmd
Auto commit by PR queue bot
2016-03-22 08:07:43 -07:00
k8s-merge-robot 88d50f30d2 Merge pull request #23228 from yifan-gu/rkt_entry_cmd
Auto commit by PR queue bot
2016-03-22 08:07:41 -07:00
k8s-merge-robot 566d23e880 Merge pull request #23205 from yifan-gu/append_image_tag
Auto commit by PR queue bot
2016-03-22 07:30:52 -07:00
Wojciech Tyczynski ebcc8f737c Parallelize computing selector spreading priority in scheduler. 2016-03-22 14:09:58 +01:00
Marek Grabowski 8a7d8c4f9d Merge pull request #23042 from gmarek/testing
Change scalability test configs
2016-03-22 14:08:58 +01:00
k8s-merge-robot 490ab398e5 Merge pull request #23324 from bryk/changelog-fix
Auto commit by PR queue bot
2016-03-22 05:40:18 -07:00
k8s-merge-robot 772069feca Merge pull request #23176 from pmorie/unique-volume-mount
Auto commit by PR queue bot
2016-03-22 05:40:17 -07:00
gmarek aa09cb097b Change scalability test configs 2016-03-22 13:39:16 +01:00
k8s-merge-robot a1cd7311f7 Merge pull request #23123 from rata/master
Auto commit by PR queue bot
2016-03-22 05:03:02 -07:00
k8s-merge-robot d37baf748f Merge pull request #22933 from liangchenye/imageConform
Auto commit by PR queue bot
2016-03-22 04:27:50 -07:00
Nikolay Murga 70b918a2c0 Fix hairpin mode 2016-03-22 13:00:18 +02:00
bryk 138d03b8b3 Fix changelog for Dashboard UI part
It had a typo and an unfinished sentence. Also, I've changes meaning to
be explicit about the note.

Fixes #23277
2016-03-22 11:59:02 +01:00
k8s-merge-robot 76acfd4b7d Merge pull request #22916 from liggitt/namespace-subresources
Auto commit by PR queue bot
2016-03-22 01:25:58 -07:00
k8s-merge-robot 7e8a89853c Merge pull request #21624 from smarterclayton/debug
Auto commit by PR queue bot
2016-03-22 00:48:15 -07:00
Wojciech Tyczynski f1248b9c82 Migrate to new conversion generator 2016-03-22 08:43:02 +01:00
k8s-merge-robot a690c2ca76 Merge pull request #22914 from liggitt/test_export
Auto commit by PR queue bot
2016-03-21 23:06:46 -07:00
k8s-merge-robot d221649429 Merge pull request #22845 from ZhangZhenhua/eliminate-roles-ambiguity
Auto commit by PR queue bot
2016-03-21 21:30:15 -07:00
Clayton Coleman 0a274a85d1 Allow logs to be used with a preloaded pod. 2016-03-21 23:59:59 -04:00
Clayton Coleman 3a29e3971b Improve terminal reuse and attach
Currently attach and the editor do not share the same logic for saving
and restoring the terminal, and are not suitable for nesting (when the
caller wants to create something, attach, and then delete something when
the attach is over).  This commit moves the interrupt protection logic
to a util package and supports nesting interrupt handlers.
2016-03-21 23:59:58 -04:00
k8s-merge-robot 4d98abf26c Merge pull request #23313 from zmerlynn/container-vm-v20160321
Auto commit by PR queue bot
2016-03-21 20:55:33 -07:00
k8s-merge-robot 562516b60e Merge pull request #22838 from resouer/util-pkg
Auto commit by PR queue bot
2016-03-21 19:21:33 -07:00
k8s-merge-robot 8c02a46c4d Merge pull request #22486 from thockin/update-gcfg-dep
Auto commit by PR queue bot
2016-03-21 18:47:21 -07:00
k8s-merge-robot 6147ef87d8 Merge pull request #22263 from runseb/22121
Auto commit by PR queue bot
2016-03-21 18:06:37 -07:00
Zach Loafman b2cf4b8c11 Bump to container-vm-v20160321 2016-03-21 17:42:34 -07:00