Commits · 8f0ab31d48cc00a8d1dce761024e8eadbfdef51b · Jacklull / k3s

23 Feb, 2016 40 commits
- Merge pull request #21762 from gmarek/nodecontroller · 8f0ab31d
  k8s-merge-robot authored Feb 23, 2016
```
Auto commit by PR queue bot
```
  8f0ab31d
- Merge pull request #21768 from mesosphere/jdef_fix_scheduler_ha_787 · f5082b6d
  k8s-merge-robot authored Feb 23, 2016
```
Auto commit by PR queue bot
```
  f5082b6d
- Merge pull request #21393 from erictune/fix-swagger-gen-1 · 6c8ce0e4
  k8s-merge-robot authored Feb 23, 2016
```
Auto commit by PR queue bot
```
  6c8ce0e4
- Merge pull request #19782 from pmorie/config-docs · 6332d840
  k8s-merge-robot authored Feb 23, 2016
```
Auto commit by PR queue bot
```
  6332d840
- Merge pull request #21704 from spxtr/finish-yaml-refactor · 178a8835
  Joe Finney authored Feb 23, 2016
```
Finish yaml refactor
```
  178a8835
- Add ConfigMap docs · 7e64b4ac
  Paul Morie authored Jan 18, 2016
  
  7e64b4ac
- Merge pull request #21486 from fgrzadkowski/docker_ubuntu_fix · cdbbeae3
  k8s-merge-robot authored Feb 23, 2016
```
Auto commit by PR queue bot
```
  cdbbeae3
- fix k8sm-787 scheduler failover regression · 250a511a
  James DeFelice authored Feb 23, 2016
  
  250a511a
- Decrease verbosity in NodeController · e99ad585
  gmarek authored Feb 23, 2016
  
  e99ad585
- Merge pull request #21687 from kargakis/generation-updates-for-label-annotation-changes · d0ce85a6
  k8s-merge-robot authored Feb 23, 2016
```
Auto commit by PR queue bot
```
  d0ce85a6
- Merge pull request #21684 from justinsb/fix_21200 · 58783bc2
  k8s-merge-robot authored Feb 23, 2016
```
Auto commit by PR queue bot
```
  58783bc2
- Merge pull request #21071 from soltysh/server_close · 7f1b6998
  k8s-merge-robot authored Feb 23, 2016
```
Auto commit by PR queue bot
```
  7f1b6998
- Merge pull request #21666 from wojtek-t/registry_options · a89b607a
  k8s-merge-robot authored Feb 23, 2016
```
Auto commit by PR queue bot
```
  a89b607a
- Merge pull request #21369 from AdoHe/kubectl_change_column_titles · 725a8e8b
  k8s-merge-robot authored Feb 23, 2016
```
Auto commit by PR queue bot
```
  725a8e8b
- Merge pull request #21273 from kargakis/rolling-updater-fix · d3661414
  k8s-merge-robot authored Feb 23, 2016
```
Auto commit by PR queue bot
```
  d3661414
- Merge pull request #21726 from janetkuo/log-on-timeout · aa9e1398
  k8s-merge-robot authored Feb 23, 2016
```
Auto commit by PR queue bot
```
  aa9e1398
- Merge pull request #21627 from justinsb/fix_11324 · 9470a7e6
  k8s-merge-robot authored Feb 23, 2016
```
Auto commit by PR queue bot
```
  9470a7e6
- Merge pull request #21706 from liggitt/token-controller · 6b649d7f
  k8s-merge-robot authored Feb 23, 2016
```
Auto commit by PR queue bot
```
  6b649d7f
- Merge pull request #20769 from bprashanth/ing_config · ac644e03
  k8s-merge-robot authored Feb 23, 2016
```
Auto commit by PR queue bot
```
  ac644e03
- registry: remove todos about rc/rs label/annotation updates · 69cd75c6
  kargakis authored Feb 22, 2016
  
  69cd75c6
- Merge pull request #21725 from spxtr/remove-e2e-from-release · b034050f
  k8s-merge-robot authored Feb 23, 2016
```
Auto commit by PR queue bot
```
  b034050f
- Merge pull request #21642 from mitake/remove-kube-dump · 84e5cabd
  k8s-merge-robot authored Feb 23, 2016
```
Auto commit by PR queue bot
```
  84e5cabd
- Merge pull request #18562 from fgimenez/added-missing-juju-dependency-to-doc · be623ae3
  k8s-merge-robot authored Feb 23, 2016
```
Auto commit by PR queue bot
```
  be623ae3
- Merge pull request #21448 from timstclair/worker-race · 3a12b037
  k8s-merge-robot authored Feb 23, 2016
```
Auto commit by PR queue bot
```
  3a12b037
- Merge pull request #21685 from gmarek/resource-usage · 599af17e
  k8s-merge-robot authored Feb 23, 2016
```
Auto commit by PR queue bot
```
  599af17e
- Merge pull request #21683 from justinsb/fix_20912 · 2acae627
  k8s-merge-robot authored Feb 22, 2016
```
Auto commit by PR queue bot
```
  2acae627
- Merge pull request #21644 from thibserot/dns2 · 5d4007f2
  k8s-merge-robot authored Feb 22, 2016
```
Auto commit by PR queue bot
```
  5d4007f2
- Merge pull request #21030 from janetkuo/deployment-label-adopted · 0afbc71f
  k8s-merge-robot authored Feb 22, 2016
```
Auto commit by PR queue bot
```
  0afbc71f
- Merge pull request #21734 from janetkuo/rollover-flake · 7662a5ee
  Brian Grant authored Feb 22, 2016
```
Wait for pods to become available before rolling over in deployment e2e test
```
  7662a5ee
- Wait for pods to become available before rolling over in deployment e2e test · ecce9492
  Janet Kuo authored Feb 22, 2016
  
  ecce9492
- Merge pull request #21710 from janetkuo/flake-event-order · f4de3ea6
  Brian Grant authored Feb 22, 2016
```
Don't rely on events in deployment rollback e2e test
```
  f4de3ea6
- Merge pull request #21727 from dchen1107/test · c833a148
  Prashanth B authored Feb 22, 2016
```
Remove potential corrupted docker network checkpoint file before star…
```
  c833a148
- Log deployment, RSes and pods on waitForDeploymentStatus timeout / condition mismatch · 4369a219
  Janet Kuo authored Feb 22, 2016
  
  4369a219
- Remove potential corrupted docker network checkpoint file before start docker · d922ddef
  Dawn Chen authored Feb 22, 2016
```
again.
```
  d922ddef
- Remove hack/e2e-from-release.sh. · 454cec71
  Joe Finney authored Feb 22, 2016
  
  454cec71
- Merge pull request #21715 from janetkuo/remove-racy-check · 6cecf2b3
  Brian Grant authored Feb 22, 2016
```
Remove racy check in waitForDeploymentStatus; wait for underlying resources to reach the desired state instead
```
  6cecf2b3
- Merge pull request #21708 from spxtr/fix-trusty · be68276d
  k8s-merge-robot authored Feb 22, 2016
```
Auto commit by PR queue bot
```
  be68276d
- Merge pull request #21686 from justinsb/aws_kubeup_build_config_early · 789fd731
  k8s-merge-robot authored Feb 22, 2016
```
Auto commit by PR queue bot
```
  789fd731
- Merge pull request #21632 from justinsb/docker_191 · 8afccef6
  k8s-merge-robot authored Feb 22, 2016
```
Auto commit by PR queue bot
```
  8afccef6
- Merge pull request #21518 from jlowdermilk/node-labels · 84e5ea99
  Dawn Chen authored Feb 22, 2016
```
Plumb node labels through salt
```
  84e5ea99