Commit Graph

19909 Commits

Author SHA1 Message Date
k8s-merge-robot
2d29d266e7 Merge pull request #16084 from smarterclayton/improve_e2e
Auto commit by PR queue bot
2015-10-27 01:09:23 -07:00
k8s-merge-robot
df265b2d6e Merge pull request #15510 from aveshagarwal/master-selflink-objref
Auto commit by PR queue bot
2015-10-27 00:37:21 -07:00
k8s-merge-robot
0ced872a26 Merge pull request #16142 from bprashanth/cloudprovider_methods
Auto commit by PR queue bot
2015-10-26 19:44:48 -07:00
Daniel Smith
fcd99461ff Merge pull request #16286 from liggitt/wsstream_cpu
Avoid CPU hotloop on client-closed websocket
2015-10-26 17:19:20 -07:00
Daniel Smith
37ee9584cb Merge pull request #16209 from erictune/fix-devel-doc
In devel docs, refer to .kube/config
2015-10-26 17:17:17 -07:00
Daniel Smith
3cc2ae4da6 Merge pull request #15831 from zhengguoyong/modify_pod_networkplugin_setup_errmsg
Modify duplicate err msg
2015-10-26 17:07:18 -07:00
Daniel Smith
075d760ad4 Merge pull request #16016 from mqliang/uselessDel
remove useless function
2015-10-26 17:06:42 -07:00
Daniel Smith
516a9a6784 Merge pull request #16129 from errordeveloper/master
azure/coreos: Quickfix for Weave 1.2
2015-10-26 17:05:42 -07:00
Daniel Smith
ebef20144b Merge pull request #16277 from jszczepkowski/hpa-prop
Fixed resetting last scale time in HPA status.
2015-10-26 16:30:34 -07:00
Clayton Coleman
a50fbd6636 All e2e tests should use NewFramework
Allows someone to replace createTestingNS consistently
2015-10-26 19:13:09 -04:00
k8s-merge-robot
0a822bb742 Merge pull request #16005 from Huawei-PaaS/fix_some_errors_in_guestbook_go
Auto commit by PR queue bot
2015-10-26 16:07:57 -07:00
Nikhil Jindal
88548e227a Merge pull request #16059 from nikhiljindal/fixVersionizeScripts
Fixing versionize docs to version more files and run update-api-reference-docs.sh
2015-10-26 13:43:10 -07:00
Prashanth Balasubramanian
f7db2eefef cloudprovider methods to list resources and get health 2015-10-26 13:36:27 -07:00
Daniel Smith
b07dd73f26 Merge pull request #16053 from saad-ali/attachDetachMutextFix
Fix GCE Cloud/Attach/Detach stability issues
2015-10-26 13:05:27 -07:00
Daniel Smith
e42f5af6a1 Merge pull request #16219 from thockin/resolvconf-filter
Add a cloud-provider hook to scrub DNS for pods
2015-10-26 12:32:02 -07:00
nikhiljindal
8234d13146 Fixing versionize docs 2015-10-26 12:14:44 -07:00
k8s-merge-robot
a094a6e3de Merge pull request #15815 from mqliang/lister_test
Auto commit by PR queue bot
2015-10-26 11:30:44 -07:00
Jordan Liggitt
85379b12ca Avoid CPU hotloop on client-closed websocket 2015-10-26 14:04:16 -04:00
k8s-merge-robot
bffdd242d8 Merge pull request #16191 from yujuhong/fix_logs
Auto commit by PR queue bot
2015-10-26 09:31:35 -07:00
Jerzy Szczepkowski
de25a3bc08 Fixed resetting last scale time in HPA status.
Fixed resetting last scale time in HPA status. Fixes #16275.
2015-10-26 16:36:05 +01:00
k8s-merge-robot
dbf9a53de9 Merge pull request #15953 from smarterclayton/return_unmodified_error_on_neg
Auto commit by PR queue bot
2015-10-26 08:15:40 -07:00
Piotr Szczesniak
abbc98076c Merge pull request #16274 from kubernetes/revert-16156-hpa-test
Revert "Improved HPA e2e to test stability of the scale decision"
2015-10-26 15:50:10 +01:00
Piotr Szczesniak
16682ca924 Revert "Improved HPA e2e to test stability of the scale decision" 2015-10-26 15:23:24 +01:00
Piotr Szczesniak
507bc3de4f Merge pull request #16265 from gmarek/fix-kubemark
Fix type in e2e.go
2015-10-26 12:19:15 +01:00
gmarek
7fc9b06f5d Fix type in e2e.go 2015-10-26 12:14:45 +01:00
Piotr Szczesniak
3a5e7d15f7 Merge pull request #16264 from gmarek/fix-kubemark
Add 500 node kubemark test to Jenkins
2015-10-26 12:09:45 +01:00
gmarek
1ceb31ffaa Add 500 node kubemark test to Jenkins 2015-10-26 11:57:55 +01:00
k8s-merge-robot
e97483ae7b Merge pull request #16086 from jackgr/conditional_annotation
Auto commit by PR queue bot
2015-10-26 03:44:28 -07:00
k8s-merge-robot
03583fb8dc Merge pull request #16017 from wojtek-t/godeps_codecgen_in_verify
Auto commit by PR queue bot
2015-10-26 03:02:11 -07:00
k8s-merge-robot
275e978b90 Merge pull request #16241 from smarterclayton/fix_flake_stream
Auto commit by PR queue bot
2015-10-26 02:54:47 -07:00
Piotr Szczesniak
33d948b573 Merge pull request #16262 from piosz/unit-fix
Fixed api reference docs
2015-10-26 10:26:35 +01:00
Piotr Szczesniak
87c6d17d3a Fixed api reference docs 2015-10-26 10:18:39 +01:00
Piotr Szczesniak
c389897017 Merge pull request #16156 from piosz/hpa-test
Improved HPA e2e to test stability of the scale decision
2015-10-26 10:10:12 +01:00
Piotr Szczesniak
cbf4bc5f7f Merge pull request #15779 from jszczepkowski/hpa-docs
Proposal for horizontal pod autoscaler updated and moved to design.
2015-10-26 09:53:43 +01:00
Jerzy Szczepkowski
c43819d8ba Proposal for horizontal pod autoscaler updated and moved to design.
Proposal for horizontal pod autoscaler updated and moved to design. Related to #15652.
2015-10-26 08:33:24 +01:00
k8s-merge-robot
0884214fe0 Merge pull request #16058 from janetkuo/revert-kubectl-slash
Auto commit by PR queue bot
2015-10-25 19:23:14 -07:00
k8s-merge-robot
b05226bfb5 Merge pull request #16221 from janetkuo/kubectl-ingresses
Auto commit by PR queue bot
2015-10-25 18:25:30 -07:00
k8s-merge-robot
54706661ad Merge pull request #15479 from feiskyer/gendocs
Auto commit by PR queue bot
2015-10-25 17:47:14 -07:00
Janet Kuo
54b743bc05 Change resource "ingress" to "ingresses" in URL path and kubectl 2015-10-25 16:54:25 -07:00
k8s-merge-robot
4f17b4b39c Merge pull request #15961 from ncdc/stream-protocol-negotiation
Auto commit by PR queue bot
2015-10-25 07:26:41 -07:00
k8s-merge-robot
fea0a7d753 Merge pull request #15850 from mqliang/refactorValidation
Auto commit by PR queue bot
2015-10-25 05:42:49 -07:00
k8s-merge-robot
6b330a8db5 Merge pull request #16112 from deads2k/expose-resync
Auto commit by PR queue bot
2015-10-25 05:16:29 -07:00
feisky
13dce74adb Gendocs for docs/admin/kube-* 2015-10-25 19:24:23 +08:00
k8s-merge-robot
55cbba3e51 Merge pull request #16234 from erictune/job-unit-fix
Auto commit by PR queue bot
2015-10-25 01:42:07 -07:00
k8s-merge-robot
c160d919f5 Merge pull request #16210 from erictune/indent-grace
Auto commit by PR queue bot
2015-10-24 18:43:37 -07:00
k8s-merge-robot
0e1ee14cc8 Merge pull request #15705 from wojtek-t/watch_options_in_client
Auto commit by PR queue bot
2015-10-24 17:39:20 -07:00
k8s-merge-robot
33dabe00a8 Merge pull request #15766 from feihujiang/supportNamespaceSelectorInAllNamespacesEndpoint
Auto commit by PR queue bot
2015-10-24 17:08:34 -07:00
Abhi Shah
76f0f8e467 Merge pull request #16189 from beldougie/patch-1
Remove breaking whitespace
2015-10-24 16:15:36 -07:00
Abhi Shah
edf5099336 Merge pull request #15947 from justinsb/aws_daemon_restart
e2e: Add aws provider to daemon_restart test
2015-10-24 16:13:12 -07:00
Abhi Shah
f430dc8ac8 Merge pull request #16149 from ZJU-SEL/fix-endpoint-port
fix buggy example for endpoint specification
2015-10-24 16:11:25 -07:00