Commit Graph

7796 Commits

Author SHA1 Message Date
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
k8s-merge-robot
e4164638c4 Merge pull request #14732 from jszczepkowski/hpa-api-fix
Auto commit by PR queue bot
2015-10-01 18:52:59 -07:00
Chao Xu
4927cec3be fix groups exposes at apis/ 2015-10-01 18:32:42 -07:00
k8s-merge-robot
2b1a0e98a2 Merge pull request #14746 from jszczepkowski/deployment-fix
Auto commit by PR queue bot
2015-10-01 18:23:12 -07:00
k8s-merge-robot
4e63cafde1 Merge pull request #14748 from gmarek/nodecontroller
Auto commit by PR queue bot
2015-10-01 17:38:53 -07:00
k8s-merge-robot
2516086771 Merge pull request #14764 from timstclair/kubectl
Auto commit by PR queue bot
2015-10-01 17:10:10 -07:00
k8s-merge-robot
b19837f4e2 Merge pull request #14767 from nikhiljindal/podConditionTransitionTime
Auto commit by PR queue bot
2015-10-01 13:01:45 -07:00
Chao Xu
f4ff0f7683 fix thirdparty API, now the config file of thirdpartyresource also need to group/version instead of version 2015-10-01 12:30:51 -07:00
David Oppenheimer
a448b5e154 Merge pull request #14697 from vishh/api-proxy
Avoid rewriting URLs in the proxy, if the application is proxy-aware.
2015-10-01 11:54:31 -07:00
k8s-merge-robot
a463b34507 Merge pull request #14822 from jszczepkowski/events-cleaunp
Auto commit by PR queue bot
2015-10-01 09:22:59 -07:00
k8s-merge-robot
d50810a1db Merge pull request #14831 from deads2k/allow-yaml-patch
Auto commit by PR queue bot
2015-10-01 08:48:45 -07:00
Wojciech Tyczynski
a659007f6a Fix TestMaxInFlight 2015-10-01 14:28:22 +02:00
k8s-merge-robot
7178921a96 Merge pull request #14375 from deads2k/remove-unprefixed-access
Auto commit by PR queue bot
2015-10-01 04:35:59 -07:00
k8s-merge-robot
8356270cce Merge pull request #14430 from Defensative/updated-fw-tags
Auto commit by PR queue bot
2015-10-01 03:51:13 -07:00
k8s-merge-robot
014ee7bb06 Merge pull request #14576 from derekwaynecarr/strategy_job_test
Auto commit by PR queue bot
2015-10-01 01:13:52 -07:00
Wojciech Tyczynski
7f9df8c062 Merge pull request #14721 from zhengguoyong/err_value
add log err value
2015-10-01 09:37:36 +02:00
Wojciech Tyczynski
b7dbbdbc09 Merge pull request #14890 from timothysc/user_error
Fix for unit test failures on user
2015-10-01 09:36:44 +02:00
k8s-merge-robot
fb4882620f Merge pull request #14611 from MikaelCluseau/wip-optional-sysctl
Auto commit by PR queue bot
2015-10-01 00:28:38 -07:00
Nikhil Jindal
00ab055fa1 Merge pull request #14893 from caesarxuchao/temp-fix-negotiate-version
temporarily disable warning message in NegotiateVersion
2015-09-30 23:13:39 -07:00
Chao Xu
dfdbaec577 temporarily disable warning message in NegotiateVersion 2015-09-30 21:41:26 -07:00
Nikhil Jindal
7adb463dd0 Merge pull request #14199 from nikhiljindal/deploymentDescribe
Adding a DeploymentDescriber to kubectl
2015-09-30 21:34:24 -07:00
k8s-merge-robot
888f08377e Merge pull request #14671 from ironcladlou/rolling-rollback-fix
Auto commit by PR queue bot
2015-09-30 20:56:05 -07:00
Timothy St. Clair
7955d428de Fix for unit test failures 'unexpected error: user: Current not implemented on linux/amd64'
running on Fedora 20 'go version go1.4.2 linux/amd64'
2015-09-30 20:33:34 -05:00
Andy Goldstein
ed021fed4c Port forwarding fixes
Correct port-forward data copying logic so that the server closes its
half of the data stream when socat exits, and the client closes its half
of the data stream when it finishes writing.

Modify the client to wait for both copies (client->server,
server->client) to finish before it unblocks.

Fix race condition in the Kubelet's handling of incoming port forward
streams. Have the client generate a connectionID header to be used to
associate the error and data streams for a single connection, instead of
assuming that streams n and n+1 go together. Attempt to generate a
pseudo connectionID in the server in the event the connectionID header
isn't present (older clients); this is a best-effort approach that only
really works with 1 connection at a time, whereas multiple concurrent
connections will only work reliably with a newer client that is
generating connectionID.
2015-09-30 20:03:49 -04:00
Brendan Burns
44a16834d8 Merge pull request #14087 from brendandburns/kubectl
Move the default schema cache to the home directory
2015-09-30 11:30:32 -07:00
Brendan Burns
2a6c7a1e79 Merge pull request #14715 from zhengguoyong/capital
set capital in some glog files
2015-09-30 11:28:05 -07:00
Brendan Burns
2cc6901d7d Merge pull request #14798 from kubernetes/revert-14616-controller-framework-flake
Revert "Controller framework test flake fix"
2015-09-30 10:04:48 -07:00
deads2k
8b063a34b0 allow yaml as argument to patch 2015-09-30 11:58:42 -04:00
deads2k
df870cf36a remove Kind from APIRequestInfo 2015-09-30 09:46:22 -04:00
deads2k
8db054651c plumb APIGroup to authorization attributes and test 2015-09-30 09:45:10 -04:00
deads2k
dc8d0de70b update APIRequestInfo for APIGroup 2015-09-30 09:45:10 -04:00
Jerzy Szczepkowski
83ec04ef58 Improved event message for ServiceController.
Improved event message for ServiceController. Follow up of #13992.
2015-09-30 13:20:41 +02:00
gmarek
a3723e2045 Separate deletion and termination evictors in NodeController, and fix rate_limited_queue.go 2015-09-30 09:42:01 +02:00
Wojciech Tyczynski
5d07236be6 Merge pull request #14808 from wojtek-t/extend_cacher_timeout
Extend timeouts in cacher test
2015-09-30 09:40:25 +02:00
David Oppenheimer
f86b119242 Merge pull request #14550 from mesosphere/sttts-fix-daemonset-tests
Fix bugs in daemonset controller and e2e tests
2015-09-30 00:37:46 -07:00
eulerzgy
4c588d771c ent 2015-09-30 14:49:19 +08:00
eulerzgy
71b96422f4 set capital in some files 2015-09-30 14:46:20 +08:00
Wojciech Tyczynski
907f2e9f89 Extend timeouts in cacher test 2015-09-30 08:26:58 +02:00
Tim Hockin
5fbcb72241 Merge pull request #14525 from dcbw/cni
CNI network plugin
2015-09-29 21:13:26 -07:00
Brendan Burns
d82567de85 Revert "Controller framework test flake fix" 2015-09-29 20:17:16 -07:00
Brendan Burns
22fa2db39a Merge pull request #14616 from mvdan/controller-framework-flake
Controller framework test flake fix
2015-09-29 20:16:36 -07:00
Brendan Burns
e827934d78 Merge pull request #12677 from andronat/kubectl_doc_cmd
A new command to read types' description from Swagger - kubectl explain
2015-09-29 19:35:37 -07:00
k8s-merge-robot
66e25b48b0 Merge pull request #14636 from feihujiang/fixMinorBugsInKubectlCommand
Auto commit by PR queue bot
2015-09-29 19:31:40 -07:00
Brendan Burns
4b1d3d8b0c Merge pull request #14245 from tpounds/update-to-aws-sdk-go-v0.9.9
Update to aws-sdk-go v0.9.9
2015-09-29 19:31:14 -07:00