Commits · e9af6c34af60dd3a79bf02338c265726f56aaf77 · Jacklull / k3s

25 Feb, 2016 40 commits
- Update the DNS template from cluster/addons/dns and combine into one file. Make… · e9af6c34
  Lucas Käldström authored Feb 25, 2016
```
Update the DNS template from cluster/addons/dns and combine into one file. Make DNS working on docker and docker-multinode
```
  e9af6c34
- Merge pull request #21997 from spxtr/fix-upgrades · df234d83
  Fabio Yeon authored Feb 25, 2016
```
Send 1.1 upgrade jobs to the proper e2e runner.
```
  df234d83
- Merge pull request #21723 from caesarxuchao/log-in-patch · b94e15d6
  Chao Xu authored Feb 25, 2016
```
Adding an apiserver log entry when Patch fails because of a meaningful conflict
```
  b94e15d6
- Send 1.1 upgrade jobs to the proper e2e runner. · 1e802923
  Joe Finney authored Feb 25, 2016
  
  1e802923
- Merge pull request #21872 from kargakis/maxUavailability-fix · 63feac0a
  Brian Grant authored Feb 25, 2016
```
kubectl: preserve availability when maxUnavailability is not 100%
```
  63feac0a
- Merge pull request #21980 from rutsky/patch-4 · 3b10ce15
  k8s-merge-robot authored Feb 25, 2016
```
Auto commit by PR queue bot
```
  3b10ce15
- Merge pull request #21379 from hlamer/hyperkube-apiserver-cert-fix · a20d4f83
  k8s-merge-robot authored Feb 25, 2016
```
Auto commit by PR queue bot
```
  a20d4f83
- Merge pull request #21354 from erictune/manual-selector · fab42f5c
  k8s-merge-robot authored Feb 25, 2016
```
Auto commit by PR queue bot
```
  fab42f5c
- Merge pull request #21272 from deads2k/add-priority-restmapper · cbf5dc12
  k8s-merge-robot authored Feb 25, 2016
```
Auto commit by PR queue bot
```
  cbf5dc12
- Merge pull request #21978 from gmarek/refactor-gatherer · 4e79b55b
  k8s-merge-robot authored Feb 25, 2016
```
Auto commit by PR queue bot
```
  4e79b55b
- Merge pull request #20710 from fgrzadkowski/backward_compatible_release · 13d23644
  Marek Grabowski authored Feb 25, 2016
```
Make #19601 backward compatible.
```
  13d23644
- fix typo: ", ." · d325ded6
  Vladimir Rutsky authored Feb 25, 2016
  
  d325ded6
- Add more logs to resource gatherer to help with debugging · fdb3020f
  gmarek authored Feb 25, 2016
  
  fdb3020f
- Make #19601 backward compatible. · 6f6cb456
  Filip Grzadkowski authored Feb 05, 2016
```
Fixes #20047
```
  6f6cb456
- Merge pull request #21185 from fabianofranz/fix_spdy_roundtripper_verify_hostname · a7f06905
  k8s-merge-robot authored Feb 25, 2016
```
Auto commit by PR queue bot
```
  a7f06905
- add prioritized RESTMapper to registered · cf6234d2
  deads2k authored Feb 24, 2016
  
  cf6234d2
- allow disambiguation of resouces · 9c42d219
  deads2k authored Feb 12, 2016
  
  9c42d219
- add a PriorityRESTMapper that can choose particular group/version of a resource · 2b84d58b
  deads2k authored Feb 15, 2016
  
  2b84d58b
- update multiRESTMapper to properly union constituent RESTMappers · 2e64a0d1
  deads2k authored Feb 08, 2016
  
  2e64a0d1
- fix ShortcutRESTMapper and prevent it from ever silently failing again · 94d683e8
  deads2k authored Feb 09, 2016
  
  94d683e8
- Merge pull request #21974 from gmarek/refactor-gatherer · 995b7279
  k8s-merge-robot authored Feb 25, 2016
```
Auto commit by PR queue bot
```
  995b7279
- Merge pull request #21163 from pmorie/downward-api-e2e-time · 47986aa0
  k8s-merge-robot authored Feb 25, 2016
```
Auto commit by PR queue bot
```
  47986aa0
- Fix spreading in resource usage gatherer · ff6b3d1f
  gmarek authored Feb 25, 2016
  
  ff6b3d1f
- Merge pull request #20940 from pwittrock/volume-sync · 82b0f0ff
  k8s-merge-robot authored Feb 25, 2016
```
Auto commit by PR queue bot
```
  82b0f0ff
- Merge pull request #20808 from soltysh/e2e_tests · bc52f12a
  k8s-merge-robot authored Feb 25, 2016
```
Auto commit by PR queue bot
```
  bc52f12a
- Merge pull request #20647 from dcbw/allow-disabling-bridge-nf-call-iptables · 33ef7a93
  k8s-merge-robot authored Feb 25, 2016
```
Auto commit by PR queue bot
```
  33ef7a93
- kubectl: preserve availability when maxUnavailability is not 100% · 9cc19102
  kargakis authored Feb 24, 2016
  
  9cc19102
- Merge pull request #21906 from justinsb/util_sets_docstring · 5f86dd1b
  k8s-merge-robot authored Feb 25, 2016
```
Auto commit by PR queue bot
```
  5f86dd1b
- Merge pull request #17913 from jtblin/jtblin/17912-pick-public-subnets · 2a58c006
  k8s-merge-robot authored Feb 24, 2016
```
Auto commit by PR queue bot
```
  2a58c006
- Explain conversion for manualSelector · 99e79720
  Eric Tune authored Feb 22, 2016
  
  99e79720
- Merge pull request #21204 from pwittrock/node-e2e-pull · 7f613dbf
  k8s-merge-robot authored Feb 24, 2016
```
Auto commit by PR queue bot
```
  7f613dbf
- Merge pull request #21957 from mqliang/deployment-preserve-availability · b27edde3
  Brian Grant authored Feb 24, 2016
```
Deployment: preserve availability when maxUnavailability is not 100%
```
  b27edde3
- Merge pull request #21935 from janetkuo/nil-pointer · be6515ca
  Brian Grant authored Feb 24, 2016
```
Fix the nil pointer dereference when counting RS replicas
```
  be6515ca
- Deployment: preserve availability when maxUnavailability is not 100% · 06d57ec7
  mqliang authored Feb 25, 2016
  
  06d57ec7
- Merge pull request #21795 from janetkuo/deployment-e2e-flake-panic · 63c85691
  Brian Grant authored Feb 24, 2016
```
Fix the nil pointer dereference in addHashKeyToRSAndPods
```
  63c85691
- Merge pull request #21870 from mqliang/lookup-cache · 9a4e3f84
  k8s-merge-robot authored Feb 24, 2016
```
Auto commit by PR queue bot
```
  9a4e3f84
- Merge pull request #21521 from mesosphere/jdef_kubelet_options1 · dcbeacde
  k8s-merge-robot authored Feb 24, 2016
```
Auto commit by PR queue bot
```
  dcbeacde
- Fix the nil pointer dereference when counting RS replicas · 069e77d5
  Janet Kuo authored Feb 24, 2016
  
  069e77d5
- When calculating pod template hash, don't include the hash label · 3ed8426a
  Janet Kuo authored Feb 24, 2016
  
  3ed8426a
- Merge pull request #21939 from david-mcmahon/fix-license · 7a8193ee
  k8s-merge-robot authored Feb 24, 2016
```
Auto commit by PR queue bot
```
  7a8193ee