Commits · f968c593e3c7d8ffbca3cf2185ced51dc52dea64 · Jacklull / k3s

22 Dec, 2015 17 commits
- Copy edits for typos · f968c593
  Ed Costello authored Oct 29, 2015
  
  f968c593
- Merge pull request #19006 from wojtek-t/wait_on_stop_watch · d20ab89b
  Filip Grzadkowski authored Dec 22, 2015
```
Fix race in watch tests - attempt 3
```
  d20ab89b
- Merge pull request #19009 from fgrzadkowski/fix_e2e · e1640989
  Filip Grzadkowski authored Dec 22, 2015
```
Fix e2e tests broken in #17865
```
  e1640989
- Fix e2e tests broken in #17865 · 4ee0e7e4
  Filip Grzadkowski authored Dec 22, 2015
  
  4ee0e7e4
- Fix race in watch tests · 41c78350
  Wojciech Tyczynski authored Dec 22, 2015
  
  41c78350
- Merge pull request #18998 from gmarek/master · 41aa6cea
  k8s-merge-robot authored Dec 22, 2015
```
Auto commit by PR queue bot
```
  41aa6cea
- Merge pull request #18918 from smarterclayton/conversion_import · 390e9179
  k8s-merge-robot authored Dec 22, 2015
```
Auto commit by PR queue bot
```
  390e9179
- Merge pull request #18655 from wojtek-t/versioned_list_options_in_server · e108a32b
  Wojciech Tyczynski authored Dec 22, 2015
```
Switch to versioned ListOptions in server.
```
  e108a32b
- Merge pull request #18999 from wojtek-t/close_watchers · 6ac2774d
  Filip Grzadkowski authored Dec 22, 2015
```
Close watchers in tests
```
  6ac2774d
- Merge pull request #19000 from wojtek-t/fix_density_test · cab6819d
  Filip Grzadkowski authored Dec 22, 2015
```
Fix density test
```
  cab6819d
- Fix density test · 6ce85817
  Wojciech Tyczynski authored Dec 22, 2015
  
  6ce85817
- Close watchers in tests · 2b8854ba
  Wojciech Tyczynski authored Dec 22, 2015
  
  2b8854ba
- Merge pull request #18985 from mlafeldt/patch-1 · 05889634
  k8s-merge-robot authored Dec 22, 2015
```
Auto commit by PR queue bot
```
  05889634
- Enable logs generation rate checking in scalability tests · 8d79c606
  gmarek authored Dec 22, 2015
  
  8d79c606
- Merge pull request #17865 from HaiyangDING/multi-scheduler-phase-1 · 9168a5c8
  k8s-merge-robot authored Dec 22, 2015
```
Auto commit by PR queue bot
```
  9168a5c8
- Merge pull request #18956 from wojtek-t/debug_etcd_generic · 0cdd2aba
  Wojciech Tyczynski authored Dec 22, 2015
```
Fix race in EtcdWatcher
```
  0cdd2aba
- Implement multi-scheduler: · d9f36072
  HaiyangDING authored Nov 27, 2015
```
1. Name default scheduler with name `kube-scheduler`
2. The default scheduler only schedules the pods meeting the following condition:
	- the pod has no annotation "scheduler.alpha.kubernetes.io/name: <scheduler-name>"
	- the pod has annotation "scheduler.alpha.kubernetes.io/name: kube-scheduler"

update gofmt

update according to @david's review

run hack/test-integration.sh, hack/test-go.sh and local e2e.test
```
  d9f36072
21 Dec, 2015 19 commits
- Merge pull request #18987 from spxtr/split-e2e · 4b18fa55
  k8s-merge-robot authored Dec 21, 2015
```
Auto commit by PR queue bot
```
  4b18fa55
- Merge pull request #18748 from miry/compact-cloud-init-script-bug · 4141679c
  k8s-merge-robot authored Dec 21, 2015
```
Auto commit by PR queue bot
```
  4141679c
- Add e2e-runner and e2e-jobs stub. · 010df488
  Joe Finney authored Dec 21, 2015
  
  010df488
- Fix closing bracket in Godoc · 1701cd4a
  Mathias Lafeldt authored Dec 21, 2015
  
  1701cd4a
- Merge pull request #18941 from smarterclayton/document_typed_ints · c59fad14
  k8s-merge-robot authored Dec 21, 2015
```
Auto commit by PR queue bot
```
  c59fad14
- Merge pull request #18413 from xiang90/p_schedule · 29754318
  k8s-merge-robot authored Dec 21, 2015
```
Auto commit by PR queue bot
```
  29754318
- Fix race in EtcdWatcher · 62972321
  Wojciech Tyczynski authored Dec 21, 2015
  
  62972321
- Merge pull request #18978 from spxtr/fix-gke-reboot · 21934272
  Joe Finney authored Dec 21, 2015
```
Remove colon from gke-ci-reboot job name (typo)
```
  21934272
- Remove colon from gke-ci-reboot job name · af461b63
  Joe Finney authored Dec 21, 2015
  
  af461b63
- Merge pull request #18867 from spxtr/gke-ci · 2c75c297
  Joe Finney authored Dec 21, 2015
```
Add gke-ci and gke-ci-reboot to source control
```
  2c75c297
- Merge pull request #18897 from spxtr/gcloud-remove · 48735bab
  Joe Finney authored Dec 21, 2015
```
Remove gcloud components update from e2e.sh
```
  48735bab
- Merge pull request #15210 from brendandburns/docs · 6815cbf7
  k8s-merge-robot authored Dec 21, 2015
```
Auto commit by PR queue bot
```
  6815cbf7
- Switch to versioned ListOptions in server. · 58336829
  Wojciech Tyczynski authored Dec 16, 2015
  
  58336829
- Merge pull request #18950 from wojtek-t/regenerate_clients · 837a070d
  k8s-merge-robot authored Dec 21, 2015
```
Auto commit by PR queue bot
```
  837a070d
- Merge pull request #18942 from smarterclayton/lowercase_filenames · bd4eec45
  k8s-merge-robot authored Dec 21, 2015
```
Auto commit by PR queue bot
```
  bd4eec45
- Regenerate clients · ebc14e1a
  Wojciech Tyczynski authored Dec 21, 2015
  
  ebc14e1a
- Merge pull request #18458 from hongchaodeng/perf · 2efc738d
  k8s-merge-robot authored Dec 21, 2015
```
Auto commit by PR queue bot
```
  2efc738d
- Fix compile errors in DeleteCollection · b279227d
  Wojciech Tyczynski authored Dec 21, 2015
  
  b279227d
- Merge pull request #18878 from janetkuo/delete-job-pod · 439d7a72
  k8s-merge-robot authored Dec 20, 2015
```
Auto commit by PR queue bot
```
  439d7a72
20 Dec, 2015 4 commits
- Merge pull request #18784 from zmerlynn/test_containervm · de338e88
  k8s-merge-robot authored Dec 20, 2015
```
Auto commit by PR queue bot
```
  de338e88
- Merge pull request #18818 from mqliang/parseordie · b97cfd8d
  k8s-merge-robot authored Dec 20, 2015
```
Auto commit by PR queue bot
```
  b97cfd8d
- Merge pull request #18813 from runseb/patch-1 · 15ecc2f7
  k8s-merge-robot authored Dec 20, 2015
```
Auto commit by PR queue bot
```
  15ecc2f7
- Document lowercase filenames · 13ee8173
  Clayton Coleman authored Dec 20, 2015
  
  13ee8173