Commit Graph

7862 Commits

Author SHA1 Message Date
Alex Robinson
52b8c40bfa Merge pull request #14758 from deads2k/fix-patch
make patch handle conflicts gracefully
2015-10-05 14:41:51 -07:00
Alex Robinson
2218ad0f86 Merge pull request #14845 from derekwaynecarr/kubectl_besteffort
Fix missing display of BestEffort resources in kubectl describe
2015-10-05 13:40:03 -07:00
Alex Robinson
d8120f5425 Merge pull request #14221 from timstclair/readiness-workers
Refactor readiness probing
2015-10-05 13:26:54 -07:00
Alex Robinson
d578e7738d Merge pull request #14242 from simonswine/fix_mulitple_subnets_per_az
aws: fixes ELB creation with multiple subnets per AZ
2015-10-05 13:06:19 -07:00
Alex Robinson
53067d0978 Merge pull request #14896 from davidopp/master
Fix race condition in DaemonSet controller. Fixes #14693.
2015-10-05 12:53:23 -07:00
Alex Robinson
b1461be2e4 Merge pull request #14982 from Huawei-PaaS/fixed_typos_for_proxy
Fixed some typos for pkg/proxy
2015-10-05 11:40:03 -07:00
deads2k
05e84fafbe move HasConflicts to shareable location 2015-10-05 14:37:57 -04:00
deads2k
41e2a4c40f make patch handle conflicts gracefully 2015-10-05 14:37:57 -04:00
Alex Robinson
8f9feb40b9 Merge pull request #14867 from tummychow/no-fielderror-glog
Remove glog dependency from fielderrors
2015-10-05 11:32:50 -07:00
Alex Robinson
0920a979c7 Merge pull request #15029 from caesarxuchao/fix-14622
fix label selector parser in case no value (or only whitespaces) is specified after the key
2015-10-05 11:24:15 -07:00
Alex Robinson
c1012d8c93 Merge pull request #14882 from ArtfulCoder/logformat
fixed log format
2015-10-05 10:50:30 -07:00
derekwaynecarr
f062a29e34 Fix missing display of BestEffort resources in kubectl describe 2015-10-05 13:38:04 -04:00
Alex Robinson
9419bfb402 Merge pull request #14937 from krousey/flaky_job_controller
Removing custom test timeout
2015-10-05 10:34:34 -07:00
Alex Robinson
7c5b8f6a58 Merge pull request #14985 from deads2k/fix-anon-struct
fix patch for anonymous struct fields
2015-10-05 10:29:59 -07:00
Alex Robinson
66cbacc9c1 Merge pull request #14967 from liggitt/set_transport_defaults
Add util to set transport defaults
2015-10-05 10:29:32 -07:00
Alex Robinson
f8c9301658 Merge pull request #15076 from jszczepkowski/hpa-e2e
Improved logging for horizontal pod autoscaler.
2015-10-05 09:57:13 -07:00
Marcin Wielgus
5adeb00583 Merge pull request #15048 from Huawei-PaaS/fixed_typos_for_cloudprovider
Fixed some typos and improved comments for cloudprovider
2015-10-05 17:49:15 +02:00
Jerzy Szczepkowski
f8b18b0a4c Improved logging for horizontal pod autoscaler.
Improved logging for horizontal pod autoscaler. Disabled redundant e2e test.
2015-10-05 16:26:14 +02:00
David Oppenheimer
723cb73057 Address reviewer comments. 2015-10-03 23:30:46 -07:00
qiaolei
919add69be Fixed some typos and improved comments 2015-10-03 22:43:10 +08:00
k8s-merge-robot
0291668748 Merge pull request #14761 from mikedanese/job-doc-fix
Auto commit by PR queue bot
2015-10-02 18:08:14 -07:00
CJ Cullen
49e204cd1e Merge pull request #14566 from erictune/job-e2e
Job e2e
2015-10-02 16:59:14 -07:00
CJ Cullen
1b841d26e7 Merge pull request #14996 from thockin/wait-poll
add wait.PollImmediate() and retool wait tests
2015-10-02 16:39:42 -07:00
Chao Xu
9be421c053 fix label selector parser in case no value (or only whitespaces) is specified after the key 2015-10-02 16:17:56 -07:00
Tim Hockin
6260759c51 Merge pull request #14328 from agonzalezro/flocker
Add flocker volume plugin
2015-10-02 16:02:18 -07:00
Tim St. Clair
52ece0c34e Refactor readiness probing
Each container with a readiness has an individual go-routine which
handles periodic probing for that container. The results are cached, and
written to the status.Manager in the pod sync path.
2015-10-02 15:37:10 -07:00
k8s-merge-robot
1b653ce1b8 Merge pull request #14889 from liggitt/honor-skip-validate
Auto commit by PR queue bot
2015-10-02 14:29:55 -07:00
deads2k
c4ca26f84d fix patch for anonymous struct fields 2015-10-02 16:32:37 -04:00
k8s-merge-robot
7007481f00 Merge pull request #14917 from nikhiljindal/deploymentController
Auto commit by PR queue bot
2015-10-02 13:18:49 -07:00
k8s-merge-robot
13382b30c4 Merge pull request #14950 from yujuhong/sync_type
Auto commit by PR queue bot
2015-10-02 12:39:00 -07:00
k8s-merge-robot
1d73382b83 Merge pull request #14958 from madhusudancs/fix-kubelet-messages
Auto commit by PR queue bot
2015-10-02 11:55:42 -07:00
Tim Hockin
1973d233e8 add wait.PollImmediate() and retool wait tests 2015-10-02 11:44:26 -07:00
k8s-merge-robot
0154f1b309 Merge pull request #14407 from jimmidyson/prometheus-version-metrics
Auto commit by PR queue bot
2015-10-02 10:43:24 -07:00
k8s-merge-robot
e330b1197e Merge pull request #14459 from bprashanth/l7_ingress_resource_refactor
Auto commit by PR queue bot
2015-10-02 10:20:48 -07:00
k8s-merge-robot
cc34aee8ab Merge pull request #14526 from saad-ali/issue13751GCEPollOps
Auto commit by PR queue bot
2015-10-02 09:46:28 -07:00
qiaolei
718d7df276 Fixed some typos 2015-10-03 00:33:35 +08:00
k8s-merge-robot
333eaf5893 Merge pull request #14710 from liggitt/authz_attr
Auto commit by PR queue bot
2015-10-02 09:18:13 -07:00
k8s-merge-robot
7f9c18d646 Merge pull request #14819 from mesosphere/sttts-add-kubectl-bind-address
Auto commit by PR queue bot
2015-10-02 08:05:57 -07:00
k8s-merge-robot
6ca515c312 Merge pull request #14820 from gmarek/playground
Auto commit by PR queue bot
2015-10-02 07:37:45 -07:00
k8s-merge-robot
a413fd278f Merge pull request #14874 from derekparker/fix-json-patch-content-type
Auto commit by PR queue bot
2015-10-02 07:08:58 -07:00
k8s-merge-robot
f5adbb7e12 Merge pull request #14926 from caesarxuchao/fix-discovery-1
Auto commit by PR queue bot
2015-10-02 06:39:44 -07:00
k8s-merge-robot
2433f2eaa4 Merge pull request #14929 from caesarxuchao/fix-thirdparty-apiversion
Auto commit by PR queue bot
2015-10-02 05:45:46 -07:00
k8s-merge-robot
1bcdd56cf3 Merge pull request #12283 from ncdc/gh8766-port-forward-not-closing-correctly
Auto commit by PR queue bot
2015-10-02 04:48:12 -07:00
k8s-merge-robot
a34855e0d1 Merge pull request #14657 from justinsb/aws_more_regions
Auto commit by PR queue bot
2015-10-02 03:48:25 -07:00
k8s-merge-robot
562ea7160d Merge pull request #14664 from deads2k/fix-prepend
Auto commit by PR queue bot
2015-10-02 03:21:10 -07:00
k8s-merge-robot
1b158fc466 Merge pull request #14706 from yifan-gu/rkt_get_status
Auto commit by PR queue bot
2015-10-02 02:25:44 -07:00
Jerzy Szczepkowski
e485fafc17 Merge pull request #14901 from wojtek-t/debug_tests
Fix TestMaxInFlight
2015-10-02 11:23:14 +02:00
Jordan Liggitt
2a1286c8f2 Add util to set transport defaults 2015-10-02 02:29:46 -04:00
Jordan Liggitt
36a721e8b7 Honor InsecureSkipVerify flag 2015-10-02 02:26:04 -04:00
Jordan Liggitt
e024e55e8e Add verb to authorizer attributes 2015-10-01 23:54:02 -04:00