Clayton Coleman
11af69da78
Ensure DeleteOptions is registered to other groups
...
The version of DeleteOptions supported by v1beta1 extensions and
v1alpha1 metrics is the v1 core group version.
2015-12-22 14:29:15 -05:00
Clayton Coleman
6d4612c8d2
Remove redundant / complex client code
2015-12-22 14:29:15 -05:00
Brendan Burns
4ca66d2aef
Merge pull request #18047 from caesarxuchao/munger-tag-new
...
Stop munger produce the link to a release version doc if it doesn't exit in the release branch
2015-12-22 10:35:20 -08:00
Brendan Burns
ac5c0aaba7
Merge pull request #17883 from jimmidyson/cadvisor-bump-0.19.4
...
Bump cadvisor to fix interface stats bugs & improve performance
2015-12-22 10:34:46 -08:00
Brendan Burns
670adb762c
Merge pull request #16525 from epc/epc-2015302
...
Copy edits for typos
2015-12-22 10:34:15 -08:00
Brendan Burns
b6ca92127d
Merge pull request #16980 from jackgr/force_apply
...
Implement conflict detection in strategic merge patch
2015-12-22 10:33:35 -08:00
Filip Grzadkowski
09f70ebbd8
Merge pull request #19015 from wojtek-t/fix_etcd_wacher
...
Fix timeout in etcdwatcher tests
2015-12-22 17:04:00 +01:00
Wojciech Tyczynski
9f35eebb81
Fix timeout in etcdwatcher tests
2015-12-22 16:56:54 +01:00
Marek Grabowski
1f26fa4049
Merge pull request #19011 from kubernetes/revert-18998-master
...
Revert "Enable logs generation rate checking in scalability tests"
2015-12-22 15:32:52 +01:00
Ed Costello
f968c593e3
Copy edits for typos
2015-12-22 09:30:48 -05:00
Marek Grabowski
79ef0d7900
Revert "Enable logs generation rate checking in scalability tests"
2015-12-22 15:30:09 +01:00
Filip Grzadkowski
d20ab89bd6
Merge pull request #19006 from wojtek-t/wait_on_stop_watch
...
Fix race in watch tests - attempt 3
2015-12-22 14:28:40 +01:00
Filip Grzadkowski
e1640989e7
Merge pull request #19009 from fgrzadkowski/fix_e2e
...
Fix e2e tests broken in #17865
2015-12-22 14:02:23 +01:00
Filip Grzadkowski
4ee0e7e43c
Fix e2e tests broken in #17865
2015-12-22 13:59:35 +01:00
Wojciech Tyczynski
41c7835039
Fix race in watch tests
2015-12-22 13:21:02 +01:00
k8s-merge-robot
41aa6cea62
Merge pull request #18998 from gmarek/master
...
Auto commit by PR queue bot
2015-12-22 04:20:43 -08:00
k8s-merge-robot
390e91793f
Merge pull request #18918 from smarterclayton/conversion_import
...
Auto commit by PR queue bot
2015-12-22 04:20:30 -08:00
Wojciech Tyczynski
e108a32b08
Merge pull request #18655 from wojtek-t/versioned_list_options_in_server
...
Switch to versioned ListOptions in server.
2015-12-22 10:57:09 +01:00
Filip Grzadkowski
6ac2774dea
Merge pull request #18999 from wojtek-t/close_watchers
...
Close watchers in tests
2015-12-22 10:56:25 +01:00
Filip Grzadkowski
cab6819dc9
Merge pull request #19000 from wojtek-t/fix_density_test
...
Fix density test
2015-12-22 10:54:59 +01:00
Wojciech Tyczynski
6ce85817ea
Fix density test
2015-12-22 10:50:05 +01:00
Wojciech Tyczynski
2b8854ba28
Close watchers in tests
2015-12-22 09:54:05 +01:00
k8s-merge-robot
058896340d
Merge pull request #18985 from mlafeldt/patch-1
...
Auto commit by PR queue bot
2015-12-22 00:48:54 -08:00
gmarek
8d79c606dc
Enable logs generation rate checking in scalability tests
2015-12-22 09:21:48 +01:00
k8s-merge-robot
9168a5c8b1
Merge pull request #17865 from HaiyangDING/multi-scheduler-phase-1
...
Auto commit by PR queue bot
2015-12-22 00:19:01 -08:00
Wojciech Tyczynski
0cdd2abada
Merge pull request #18956 from wojtek-t/debug_etcd_generic
...
Fix race in EtcdWatcher
2015-12-22 08:02:49 +01:00
HaiyangDING
d9f3607292
Implement multi-scheduler:
...
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
2015-12-22 10:49:40 +08:00
k8s-merge-robot
4b18fa553f
Merge pull request #18987 from spxtr/split-e2e
...
Auto commit by PR queue bot
2015-12-21 15:56:41 -08:00
k8s-merge-robot
4141679caa
Merge pull request #18748 from miry/compact-cloud-init-script-bug
...
Auto commit by PR queue bot
2015-12-21 15:56:15 -08:00
Joe Finney
010df488fa
Add e2e-runner and e2e-jobs stub.
2015-12-21 14:41:05 -08:00
Mathias Lafeldt
1701cd4a3a
Fix closing bracket in Godoc
2015-12-21 21:36:11 +01:00
k8s-merge-robot
c59fad149b
Merge pull request #18941 from smarterclayton/document_typed_ints
...
Auto commit by PR queue bot
2015-12-21 12:16:47 -08:00
k8s-merge-robot
29754318ad
Merge pull request #18413 from xiang90/p_schedule
...
Auto commit by PR queue bot
2015-12-21 11:32:53 -08:00
Chao Xu
2b2f285777
run hack/update-generated-docs.sh
2015-12-21 10:41:30 -08:00
Chao Xu
b728db081b
Munger now checks the release branch to verify if a file exist there before
...
generating a link to it.
2015-12-21 10:40:15 -08:00
Wojciech Tyczynski
6297232112
Fix race in EtcdWatcher
2015-12-21 19:24:37 +01:00
Joe Finney
2193427262
Merge pull request #18978 from spxtr/fix-gke-reboot
...
Remove colon from gke-ci-reboot job name (typo)
2015-12-21 10:17:21 -08:00
Joe Finney
af461b6361
Remove colon from gke-ci-reboot job name
2015-12-21 09:28:43 -08:00
Joe Finney
2c75c29783
Merge pull request #18867 from spxtr/gke-ci
...
Add gke-ci and gke-ci-reboot to source control
2015-12-21 09:11:54 -08:00
Joe Finney
48735bab79
Merge pull request #18897 from spxtr/gcloud-remove
...
Remove gcloud components update from e2e.sh
2015-12-21 09:09:51 -08:00
Jimmi Dyson
62eb82d6fc
Preload docker dep to work around Docker package refactoring & godep incompatibility
...
Fixes #18833
2015-12-21 17:07:29 +00:00
Jimmi Dyson
041ab17a67
Bump cadvisor to fix interface stats bugs & improve performance
...
Includes necessary godep upgrades for docker & systemd packages as well as
migrating from docker/libcontainer to opencontainers/runc/libcontainer.
2015-12-21 17:07:21 +00:00
k8s-merge-robot
6815cbf742
Merge pull request #15210 from brendandburns/docs
...
Auto commit by PR queue bot
2015-12-21 07:58:46 -08:00
Wojciech Tyczynski
58336829be
Switch to versioned ListOptions in server.
2015-12-21 14:23:37 +01:00
k8s-merge-robot
837a070d2f
Merge pull request #18950 from wojtek-t/regenerate_clients
...
Auto commit by PR queue bot
2015-12-21 05:22:06 -08:00
k8s-merge-robot
bd4eec4577
Merge pull request #18942 from smarterclayton/lowercase_filenames
...
Auto commit by PR queue bot
2015-12-21 05:22:04 -08:00
Wojciech Tyczynski
ebc14e1a2e
Regenerate clients
2015-12-21 11:12:25 +01:00
k8s-merge-robot
2efc738d5b
Merge pull request #18458 from hongchaodeng/perf
...
Auto commit by PR queue bot
2015-12-21 01:54:09 -08:00
Wojciech Tyczynski
b279227d83
Fix compile errors in DeleteCollection
2015-12-21 09:29:11 +01:00
k8s-merge-robot
439d7a721e
Merge pull request #18878 from janetkuo/delete-job-pod
...
Auto commit by PR queue bot
2015-12-20 16:25:32 -08:00
