k8s-merge-robot 601e09852c Merge pull request #23590 from kargakis/timeout-logs-attach ...

Automatic merge from submit-queue

kubectl: more sophisticated pod selection for logs and attach

Trying to get the logs or attach to an object other than a pod
will poll forever if that object has no replicas. This commit adds
a 20s timeout for polling.

@kubernetes/kubectl @deads2k @fabianofranz

2016-05-08 10:51:00 -07:00

..

admission

fully qualify admission resources and kinds

2016-04-26 07:55:33 -04:00

api

Merge pull request #22575 from MikaelCluseau/wip-issue-20466

2016-05-08 08:45:15 -07:00

apimachinery

Add third party support to kubectl

2016-03-31 10:53:32 -07:00

apis

Inline default methods by hand in custom conversions

2016-05-07 11:55:31 -04:00

apiserver

Merge pull request #23928 from caesarxuchao/cascading-deletion-API-changes

2016-05-05 19:46:40 -07:00

auth

add user.Info.GetExtra

2016-04-26 15:08:34 -04:00

capabilities

…

client

Merge pull request #25006 from liggitt/third-party-root-scope

2016-05-06 20:50:35 -07:00

cloudprovider

Merge pull request #25225 from a-robinson/fix

2016-05-05 14:35:01 -07:00

controller

Merge pull request #24929 from mwielgus/heapster_godeps_bump

2016-05-06 13:57:35 -07:00

conversion

Avoid allocations and a reflect.Call in conversion

2016-04-26 16:42:12 -04:00

credentialprovider

Uncomment the code that cause by #19254

2016-04-25 23:21:31 +08:00

fieldpath

…

fields

…

genericapiserver

Merge pull request #24710 from smarterclayton/store_proto_in_etcd

2016-05-05 19:00:20 -07:00

healthz

…

httplog

…

hyperkube

…

kubectl

Merge pull request #23590 from kargakis/timeout-logs-attach

2016-05-08 10:51:00 -07:00

kubelet

Merge pull request #22575 from MikaelCluseau/wip-issue-20466

2016-05-08 08:45:15 -07:00

kubemark

Fix the rest of the code

2016-04-29 17:12:10 -04:00

labels

Regenerate auto-generated files

2016-03-17 09:30:02 +01:00

master

Define PodDisruption API types.

2016-05-06 17:24:53 -07:00

metrics

Fix the rest of the code

2016-04-29 17:12:10 -04:00

probe

Uncomment the code that cause by #19254

2016-04-25 23:21:31 +08:00

proxy

Fix the rest of the code

2016-04-29 17:12:10 -04:00

quota

Merge pull request #24514 from derekwaynecarr/pod_quota_fix

2016-04-27 06:27:51 -07:00

registry

Merge pull request #25006 from liggitt/third-party-root-scope

2016-05-06 20:50:35 -07:00

runtime

Merge pull request #24727 from smarterclayton/fast_path_lookup

2016-05-06 07:10:18 -07:00

securitycontext

Refactor CreateContainer.

2016-04-14 17:05:46 -07:00

serviceaccount

Improve error messages in jwt_test.go

2016-04-21 11:37:14 +08:00

ssh

Merge pull request #24506 from timstclair/ssh

2016-04-19 22:36:44 -07:00

storage

Merge pull request #25211 from lavalamp/leak

2016-05-06 15:03:21 -07:00

types

Create Unix UID/GID types

2016-02-24 11:22:02 -05:00

ui

Remove url query param that is leading to XSS issue

2016-03-22 10:35:06 -07:00

util

Merge pull request #24164 from sjenning/fix-util-cache

2016-05-06 14:43:53 -07:00

version

Include Go version, platform, and other build info in version string

2016-03-14 13:55:28 -07:00

volume

Merge pull request #20490 from swagiaal/auto-supplemental-group-kubelet

2016-05-08 08:08:01 -07:00

watch

Merge pull request #24789 from wojtek-t/use_proper_codec_in_client

2016-05-04 11:00:04 -07:00

OWNERS

Move blunderbuss assignees into tree

2016-03-02 20:46:32 -05:00