Commit Graph

11272 Commits

Author SHA1 Message Date
k8s-merge-robot
4a6e6b3fbf Merge pull request #23213 from pweil-/generator-besteffort
Auto commit by PR queue bot
2016-03-23 07:50:09 -07:00
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
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
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
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
nikhiljindal
532398afb3 Remove url query param that is leading to XSS issue 2016-03-22 10:35:06 -07:00
Paul Weil
dd4ff1690d provide best effort generation even if types are asymmetrical 2016-03-22 11:44:07 -04:00
Hongchao Deng
189ce6e397 storage: add custom storage error 2016-03-22 08:19:16 -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
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
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
Nikolay Murga
70b918a2c0 Fix hairpin mode 2016-03-22 13:00:18 +02: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
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
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
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
0a28a38110 Merge pull request #22280 from justinsb/fix_error_message_formats
Auto commit by PR queue bot
2016-03-21 16:53:38 -07:00
Jordan Liggitt
1d4c56c2f6 Move TestRuntimeCache into non-test file 2016-03-21 16:21:55 -04:00
Rodrigo Campos
c0af96ccc2 Make "--insecure-skip-tls-verify" work on all cases
In the getting started example of AWS, the master uses an IP that is changed on
stop/start. If you are playing with a cluster and stop and start the master,
the IP is changed and you can't connect again, even using the
"--insecure-skip-tls-verify" option.

This patch fixes it and makes the option work on those cases too by making
sure no CA/CAData is added when it shouldn't.
2016-03-21 16:31:31 -03:00
Janet Kuo
482efba8de Copy annotations back from RS to Deployment on rollback 2016-03-21 10:21:48 -07:00
k8s-merge-robot
2bb6f74bf9 Merge pull request #23099 from shawnps/patch-12
Auto commit by PR queue bot
2016-03-21 09:19:21 -07:00
harry
b0900bf0d4 Refactor diff into sub pkg 2016-03-21 20:21:39 +08:00
harry
d6e1566509 Refector deadlock into detector pkg 2016-03-21 20:20:05 +08:00
Harry Zhang
a4d04095d0 Refactor crlf & crypto 2016-03-21 20:20:05 +08:00
Harry Zhang
7178fba251 Move crlf.go to sub pkg 2016-03-21 20:20:05 +08:00
harry
26dad2c428 Update generated docs 2016-03-21 15:36:24 +08:00
harry
343b1927d1 Refactor config map into sub pkg 2016-03-21 14:50:57 +08:00
harry
bc422f077a Refactor bool_flag into sub pkg 2016-03-21 14:50:57 +08:00
harry
b6924a322a Refactor cache into util sub pkg 2016-03-21 14:50:57 +08:00
k8s-merge-robot
b56252e338 Merge pull request #23161 from thockin/drain-help-typo
Auto commit by PR queue bot
2016-03-19 22:44:54 -07:00
k8s-merge-robot
b9b3b5eb4c Merge pull request #23175 from AdoHe/request_slow_log
Auto commit by PR queue bot
2016-03-19 22:08:11 -07:00
Tim Hockin
1e5ce735fc Fix typo in help for kubectl drain 2016-03-19 20:42:51 -07:00
k8s-merge-robot
b077b685d9 Merge pull request #23246 from AdoHe/update_expose_example
Auto commit by PR queue bot
2016-03-19 12:09:23 -07:00
AdoHe
57534eaec9 update expose command description to add deployment 2016-03-19 13:51:21 -04:00
k8s-merge-robot
08c706a8ab Merge pull request #23194 from hongchaodeng/dep
Auto commit by PR queue bot
2016-03-19 06:35:17 -07:00
k8s-merge-robot
0fe049f9ff Merge pull request #23019 from alex-mohr/oplimit
Auto commit by PR queue bot
2016-03-19 02:26:56 -07:00
Hongchao Deng
0a1ff0bb0b fix EtcdTestServer 2016-03-18 23:39:48 -07:00
k8s-merge-robot
4be9587b43 Merge pull request #23210 from rsc/master
Auto commit by PR queue bot
2016-03-18 21:31:54 -07:00
k8s-merge-robot
8fb0bfb0d3 Merge pull request #23179 from wojtek-t/remove_old_deep_copy_generator
Auto commit by PR queue bot
2016-03-18 19:35:54 -07:00
k8s-merge-robot
2c5903acf1 Merge pull request #23222 from madhusudancs/kubectl-expose-deployment-example
Auto commit by PR queue bot
2016-03-18 19:00:42 -07:00
Yifan Gu
9d3d55d0fb rkt: Unmarshal the ENTRYPOINT/CMD from jsons instead of strings.
Using json makes this robust to ENTRYPOINT/CMD that contains space.

Also removed 'RemainAfterExit' option, originally this option is
useful when we implement GetPods() by 'systemctl list-units'.
However since we are using rkt API service now, it's no longer needed.
2016-03-18 17:18:24 -07:00