Commit Graph

19724 Commits

Author SHA1 Message Date
k8s-merge-robot
bd1c26c152 Merge pull request #15765 from mqliang/importAlias-kSelector
Auto commit by PR queue bot
2015-10-19 08:03:15 -07:00
mqliang
b6be9b9684 use string constant instead of duplicating 2015-10-19 22:00:41 +08:00
k8s-merge-robot
0e1b78fb6e Merge pull request #15728 from a-robinson/dockerlog
Auto commit by PR queue bot
2015-10-19 06:59:38 -07:00
mqliang
62846b8b3c solve conflict after rebase 2015-10-19 21:56:24 +08:00
mqliang
b9f9944351 add unit test for StoreToJobLister 2015-10-19 21:56:24 +08:00
k8s-merge-robot
77207d75e1 Merge pull request #15667 from JanetKuo/kubectl-watch-list
Auto commit by PR queue bot
2015-10-19 06:28:35 -07:00
Deyuan Deng
151e4b7cb8 Search for port number for service locator 2015-10-19 21:22:59 +08:00
k8s-merge-robot
58f168315e Merge pull request #15828 from smarterclayton/use_pod_logs
Auto commit by PR queue bot
2015-10-19 06:02:32 -07:00
feihujiang
a456b4c424 Remove useless codes about Minion kind 2015-10-19 19:29:45 +08:00
Maciej Szulik
1ee20363e0 An attempt to fix flake in TestControllerSyncJob (14500) 2015-10-19 12:46:33 +02:00
k8s-merge-robot
02dd86c136 Merge pull request #15472 from zhengguoyong/del_unnessary_var_definition
Auto commit by PR queue bot
2015-10-19 03:33:11 -07:00
k8s-merge-robot
75c977d200 Merge pull request #15596 from zhengguoyong/alias_util_errors_packagename
Auto commit by PR queue bot
2015-10-19 02:35:37 -07:00
k8s-merge-robot
44a9877bd4 Merge pull request #15750 from yehuis4/master
Auto commit by PR queue bot
2015-10-19 01:06:34 -07:00
k8s-merge-robot
3ee1c58756 Merge pull request #15773 from mqliang/BE1-ErrMsg
Auto commit by PR queue bot
2015-10-19 00:37:19 -07:00
Clayton Coleman
34e9478cd3 Use pod logs subresource from e2e
Means that e2e code doesn't need to access the proxy
2015-10-18 23:06:36 -04:00
k8s-merge-robot
56093b7779 Merge pull request #15807 from liggitt/setrlimit
Auto commit by PR queue bot
2015-10-18 20:02:34 -07:00
Jordan Liggitt
55cd3f1030 Platform-specific setRLimit implementations 2015-10-18 21:26:39 -04:00
k8s-merge-robot
67cb65d906 Merge pull request #15788 from caesarxuchao/gen-docs-extensions
Auto commit by PR queue bot
2015-10-18 18:02:09 -07:00
Gabriele Farina
416225f554 Update OS/X instructions.
Update to reflect recent changes in docker-machine for OS/X users.

Related to this change: docker/machine#1791
2015-10-18 21:50:39 +01:00
k8s-merge-robot
ff7ce44e74 Merge pull request #14517 from jayunit100/reorder
Auto commit by PR queue bot
2015-10-18 09:04:23 -07:00
Dr. Stefan Schimanski
f866243e0a Fix kube-ui e2e test waiting for the rc pods
Kube-ui pods do not have the {"name":rcName} label like pods created in
e2e tests. Hence, we cannot use the waitForRCPods function directly, but
have to pass a custom label.
2015-10-18 14:51:36 +01:00
k8s-merge-robot
578d752174 Merge pull request #15772 from mesosphere/sttts-temporarily-fix-nodeselector-e2e-test
Auto commit by PR queue bot
2015-10-18 04:35:14 -07:00
k8s-merge-robot
09a3871506 Merge pull request #15755 from zhengguoyong/del_capatical_packagename_for_cadvisorApi2
Auto commit by PR queue bot
2015-10-18 04:04:11 -07:00
He Simei
d45fc707dd minor clean upstart script for ubuntu 2015-10-18 18:37:01 +08:00
k8s-merge-robot
80838ff86a Merge pull request #15454 from feihujiang/describePodsShowCommandAndArgs
Auto commit by PR queue bot
2015-10-18 02:03:39 -07:00
k8s-merge-robot
5755e52b10 Merge pull request #15790 from mikedanese/azure-bankruptcy
Auto commit by PR queue bot
2015-10-18 01:32:36 -07:00
Fabio Yeon
54c899370e Merge pull request #15821 from kubernetes/revert-15787-release-tar-fix-for-15713
Revert "e2e: kubectl HTTP fix for #15713"
2015-10-17 23:02:43 -07:00
Fabio Yeon
38dc2bd6d6 Revert "e2e: kubectl HTTP fix for #15713" 2015-10-17 22:34:43 -07:00
eulerzgy
f8f9afb874 alias local packagename for pkg/util/errors 2015-10-18 09:37:46 +08:00
eulerzgy
760b2c901b del unnessary var definition 2015-10-18 09:05:47 +08:00
k8s-merge-robot
0338e0ef53 Merge pull request #15787 from ashcrow/release-tar-fix-for-15713
Auto commit by PR queue bot
2015-10-17 05:37:40 -07:00
Dr. Stefan Schimanski
d11a3930c0 Remove race of ClusterDns e2e frontend test and starting pod 2015-10-17 12:16:54 +02:00
Dr. Stefan Schimanski
d4602bb909 Remove race of waitForRCPodsRunning Running check and internal pod store 2015-10-17 12:15:00 +02:00
k8s-merge-robot
d329a66434 Merge pull request #15518 from ravilr/mesos_graceful_termination_tasklost
Auto commit by PR queue bot
2015-10-17 02:51:21 -07:00
k8s-merge-robot
1bba475a9d Merge pull request #15735 from mesosphere/jdef-fix-tasks-and-profiling
Auto commit by PR queue bot
2015-10-17 02:20:18 -07:00
k8s-merge-robot
483c4a8d85 Merge pull request #15733 from yujuhong/disable_keepalive
Auto commit by PR queue bot
2015-10-17 01:54:15 -07:00
k8s-merge-robot
b2dcbb6439 Merge pull request #15721 from andyzheng0831/trusty
Auto commit by PR queue bot
2015-10-17 01:06:38 -07:00
k8s-merge-robot
72235d6607 Merge pull request #15709 from derekwaynecarr/ingress_status
Auto commit by PR queue bot
2015-10-17 00:40:35 -07:00
k8s-merge-robot
d3ca12f61b Merge pull request #15053 from smarterclayton/stdin_once
Auto commit by PR queue bot
2015-10-17 00:03:32 -07:00
k8s-merge-robot
70b231231b Merge pull request #15798 from yifan-gu/rkt_gc_service
Auto commit by PR queue bot
2015-10-16 23:32:29 -07:00
k8s-merge-robot
d94e4d64f2 Merge pull request #15694 from mqliang/jobList
Auto commit by PR queue bot
2015-10-16 21:22:12 -07:00
k8s-merge-robot
d41737eff2 Merge pull request #15689 from caesarxuchao/default-ns-componentstatus
Auto commit by PR queue bot
2015-10-16 20:56:38 -07:00
k8s-merge-robot
e12019c658 Merge pull request #15682 from smarterclayton/make_proxy_resync_longer
Auto commit by PR queue bot
2015-10-16 20:30:36 -07:00
k8s-merge-robot
68717ddae0 Merge pull request #15659 from caesarxuchao/discovery-client
Auto commit by PR queue bot
2015-10-16 20:03:33 -07:00
k8s-merge-robot
d471318aa8 Merge pull request #15799 from dchen1107/podstatus
Auto commit by PR queue bot
2015-10-16 19:32:30 -07:00
He Simei
7c9903bd02 mount /var/lib/docker rw 2015-10-17 09:53:04 +08:00
He Simei
9c3600d5d3 enhance upstart param for containerized kubelet 2015-10-17 09:52:38 +08:00
Mike Danese
8e8437dad8 declare azure/ubuntu/saltstack bankruptcy 2015-10-16 18:21:21 -07:00
Clayton Coleman
d6fcc332af Codecgen output for stdinOnce 2015-10-16 20:33:52 -04:00
Clayton Coleman
7f6f85bd7b Fix attach, which was broken during the refactor
The new e2e test catches the break in attach (no e2e test
exposed this codepath before).
2015-10-16 20:33:51 -04:00