github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
19,580 Commits
32 Branches
881 Tags
633 MiB
Commit Graph

19580 Commits (c5f7278044ca555e3982645c4d51312bf2e5a7bc)

Author SHA1 Message Date
feihujiang c5f7278044 Return a clear error when deleting an immortal namespace 2015-10-21 14:37:07 +08:00
k8s-merge-robot c4779fbc4f Merge pull request #15475 from jijun2/fix-cni_test 
Auto commit by PR queue bot
 2015-10-20 01:30:24 -07:00
k8s-merge-robot c45625eb77 Merge pull request #15845 from ddysher/service-locator 
Auto commit by PR queue bot
 2015-10-20 01:04:18 -07:00
k8s-merge-robot b95f7b7169 Merge pull request #15901 from caesarxuchao/fix-15659 
Auto commit by PR queue bot
 2015-10-20 00:35:45 -07:00
k8s-merge-robot a66ab00f44 Merge pull request #15497 from zmerlynn/fix_cherry_pick 
Auto commit by PR queue bot
 2015-10-19 23:09:21 -07:00
k8s-merge-robot 1f28ef05de Merge pull request #15884 from ixdy/gke-daemon-restart 
Auto commit by PR queue bot
 2015-10-19 22:02:19 -07:00
k8s-merge-robot 48ced9de86 Merge pull request #15612 from jimmidyson/cadvisor-kubelet 
Auto commit by PR queue bot
 2015-10-19 20:10:21 -07:00
k8s-merge-robot 1f758d8ca6 Merge pull request #15568 from a-robinson/e2e 
Auto commit by PR queue bot
 2015-10-19 19:43:18 -07:00
k8s-merge-robot 345cda76b3 Merge pull request #15871 from mikedanese/upgrade-gce-1-to-11 
Auto commit by PR queue bot
 2015-10-19 19:35:56 -07:00
Chao Xu 5f210c6473 fix names in comments 2015-10-19 16:10:02 -07:00
k8s-merge-robot b5c0984d4c Merge pull request #15566 from erictune/api-conv 
Auto commit by PR queue bot
 2015-10-19 16:06:55 -07:00
k8s-merge-robot 0d7b53a201 Merge pull request #15813 from mesosphere/sttts-clusterdns-example 
Auto commit by PR queue bot
 2015-10-19 14:47:27 -07:00
k8s-merge-robot b896a66679 Merge pull request #15739 from JanetKuo/kubectl-autoscale 
Auto commit by PR queue bot
 2015-10-19 14:15:23 -07:00
k8s-merge-robot 4d18186afd Merge pull request #15832 from wojtek-t/update_ugorji_doc 
Auto commit by PR queue bot
 2015-10-19 14:05:55 -07:00
Jeff Grafton f419f407c2 Correctly skip daemon restart tests unless running on GCE 2015-10-19 13:58:22 -07:00
Mike Danese 92404e7cb6 add upgrade test between 1.0 and 1.1 for gce 2015-10-19 13:51:57 -07:00
k8s-merge-robot 18ad5f8cdf Merge pull request #15745 from ArtfulCoder/reduceTimeout 
Auto commit by PR queue bot
 2015-10-19 13:02:17 -07:00
Mike Danese 95b8394a22 Merge pull request #15861 from mikedanese/upgrade-num-minion 
increase NUM_MINIONS for jenkins gce upgrade test
 2015-10-19 12:01:12 -07:00
Eric Tune a1549496ee Documented required/optional fields. 2015-10-19 11:16:24 -07:00
Mike Danese ece5779f5a increase NUM_MINIONS for jenkins gce upgrade test 2015-10-19 11:14:20 -07:00
Wojciech Tyczynski 4a4831906c api_changes.md changes for json-related code autogeneration. 2015-10-19 19:37:53 +02:00
Mike Danese ac5524d84d Merge pull request #14496 from kargakis/deep-copies-fix 
deep-copies: Structs cannot be nil
 2015-10-19 10:28:55 -07:00
Mike Danese 970ee8de87 Merge pull request #15753 from mqliang/jobListerTest 
Add unit test for StoreToJobLister
 2015-10-19 10:26:19 -07:00
Mike Danese cce7635b3b Merge pull request #15780 from cheld/fix-vagrant-up 
disabled parallel provisioning in vagrant
 2015-10-19 10:25:44 -07:00
Janet Kuo 8105aa44a0 Implement kubectl autoscale 2015-10-19 09:59:22 -07:00
k8s-merge-robot cadb6c06be Merge pull request #14161 from feihujiang/letKubectlExecFollowDashRule 
Auto commit by PR queue bot
 2015-10-19 08:58:37 -07:00
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
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
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
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
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