Commits · c50cad105c681a50ce445ea0ee1df4a1feff96e9 · Jacklull / k3s

19 Sep, 2015 25 commits
- Check hack/verify-generated-swagger-docs.sh in CI · c50cad10
  Eric Paris authored Sep 19, 2015
```
We weren't. And shockingly it's gotten out of date.
```
  c50cad10
- Merge pull request #14229 from gmarek/update-swagger-docs · c02d5117
  Eric Paris authored Sep 19, 2015
```
Fix swagger docs
```
  c02d5117
- Merge pull request #14233 from kubernetes/revert-14202-prometheus · 750cbe30
  Eric Paris authored Sep 19, 2015
```
Revert "Update prometheus library usage"
```
  750cbe30
- Revert "Update prometheus library usage" · 98a971cc
  Marek Grabowski authored Sep 19, 2015
  
  98a971cc
- Merge pull request #14175 from alfred-huangjian/l7-ingress-api-type-init-version · a2dcd3b7
  k8s-merge-robot authored Sep 19, 2015
```
Auto commit by PR queue bot
```
  a2dcd3b7
- Fix swagger docs · a5de60f9
  gmarek authored Sep 19, 2015
  
  a5de60f9
- Merge pull request #14202 from timstclair/prometheus · 20c01f07
  Eric Paris authored Sep 19, 2015
```
Update prometheus library usage
```
  20c01f07
- Add Ingress API resource type - auto generated files · 44477b24
  Jian Huang authored Sep 19, 2015
  
  44477b24
- Add Ingress API Resource Type for L7 loadbalancing · a5e23ef5
  Jian Huang authored Sep 17, 2015
  
  a5e23ef5
- Merge pull request #14224 from quinton-hoole/2015-09-18-fix-kubeproxy-e2e-regex · dafb3cc7
  Quinton Hoole authored Sep 19, 2015
```
Don't run slow e2e tests in the parallel runs.
```
  dafb3cc7
- Fix regex to banish KubeProxy test as slow. · 62a0aba5
  Quinton Hoole authored Sep 19, 2015
  
  62a0aba5
- Merge pull request #14220 from ghodss/replication-manager-comments · 3d71d8f3
  k8s-merge-robot authored Sep 19, 2015
```
Auto commit by PR queue bot
```
  3d71d8f3
- Merge pull request #13964 from liguangbo/fix_make_ca_cert_proxy · 83192aac
  k8s-merge-robot authored Sep 19, 2015
```
Auto commit by PR queue bot
```
  83192aac
- Merge pull request #14195 from mikedanese/daemon-log · fa86f074
  k8s-merge-robot authored Sep 18, 2015
```
Auto commit by PR queue bot
```
  fa86f074
- Merge pull request #14209 from nikhiljindal/deploymentController · 7425cd5a
  k8s-merge-robot authored Sep 18, 2015
```
Auto commit by PR queue bot
```
  7425cd5a
- Merge pull request #14134 from eparis/string-set-intersection · 5de212ed
  k8s-merge-robot authored Sep 18, 2015
```
Auto commit by PR queue bot
```
  5de212ed
- Merge pull request #14196 from mikedanese/various-job · 3eabb81e
  k8s-merge-robot authored Sep 18, 2015
```
Auto commit by PR queue bot
```
  3eabb81e
- Adding scale up/down code to DeploymentController · 89e96910
  nikhiljindal authored Sep 17, 2015
  
  89e96910
- Merge pull request #14206 from ixdy/jenkins-configs · 8a95a82c
  Quinton Hoole authored Sep 18, 2015
```
Demote "KubeProxy should test kube-proxy" to slow tests
```
  8a95a82c
- Merge pull request #14218 from kubernetes/revert-13417-kubelet_tolerates_dead_cloud_api · 851e3c1c
  Quinton Hoole authored Sep 18, 2015
```
Revert "Update node status even if cloudprovider API dies"
```
  851e3c1c
- Merge pull request #12894 from nikhiljindal/PodCondition · 5d67c2ce
  k8s-merge-robot authored Sep 18, 2015
```
Auto commit by PR queue bot
```
  5d67c2ce
- Clean up comments on replication manager · 436fedd6
  Sam Ghods authored Sep 18, 2015
  
  436fedd6
- Merge pull request #14114 from hurf/qt_agg_errors · 7ddbdc47
  k8s-merge-robot authored Sep 18, 2015
```
Auto commit by PR queue bot
```
  7ddbdc47
- Revert "Update node status even if cloudprovider API dies" · 6df2139d
  Tim Hockin authored Sep 18, 2015
  
  6df2139d
- Merge pull request #14160 from zhengguoyong/minions · 8754eea7
  Nikhil Jindal authored Sep 18, 2015
```
change minions to nodes
```
  8754eea7
18 Sep, 2015 15 commits
- Merge pull request #14185 from tmrts/formatting · cad5f033
  k8s-merge-robot authored Sep 18, 2015
```
Auto commit by PR queue bot
```
  cad5f033
- Demote "KubeProxy should test kube-proxy" to slow tests · 85179f33
  Jeff Grafton authored Sep 18, 2015
  
  85179f33
- sort jobs by creation timestamp to make getPodJob deterministic · 0ae2334a
  Mike Danese authored Sep 18, 2015
  
  0ae2334a
- change log level on a lot of glog calls in job controller · 59657607
  Mike Danese authored Sep 18, 2015
  
  59657607
- serialize access to active with a lock · 267cc9de
  Mike Danese authored Sep 18, 2015
  
  267cc9de
- Merge pull request #14142 from mikedanese/job-update · e07eb387
  Tim Hockin authored Sep 18, 2015
```
Various fixes to job
```
  e07eb387
- Merge pull request #13825 from rootfs/path_len · 8d7038ee
  k8s-merge-robot authored Sep 18, 2015
```
Auto commit by PR queue bot
```
  8d7038ee
- Merge pull request #12887 from djosborne/master · 6def707f
  Tim Hockin authored Sep 18, 2015
```
added calico-kubernetes-fedora-digitalocean demo
```
  6def707f
- Merge pull request #12717 from tamnd/fixdockercfg · 9698e957
  Tim Hockin authored Sep 18, 2015
```
Fix new docker config format for private registries
```
  9698e957
- Remove deprecated prometheus extraction libraries · 04523856
  Tim St. Clair authored Sep 18, 2015
  
  04523856
- Use up-to-date prometheus extraction libraries · 3a94f3b5
  Tim St. Clair authored Sep 18, 2015
  
  3a94f3b5
- Added new prometheus extraction godep & update prometheus library godeps · 495f6ef2
  Tim St. Clair authored Sep 18, 2015
  
  495f6ef2
- Merge pull request #14092 from nikhiljindal/deploymentAPI · 9537c43a
  k8s-merge-robot authored Sep 18, 2015
```
Auto commit by PR queue bot
```
  9537c43a
- fix incorrect log statement in daemon controller · 144d72ca
  Mike Danese authored Sep 18, 2015
  
  144d72ca
- make JobController RestartPolicy independent · e29e6067
  Mike Danese authored Sep 17, 2015
  
  e29e6067