Commit Graph

22335 Commits

Author SHA1 Message Date
k8s-merge-robot
bf67eab89f Merge pull request #18216 from gmarek/limits
Auto commit by PR queue bot
2015-12-18 20:39:01 -08:00
k8s-merge-robot
00c754108f Merge pull request #18165 from fabianofranz/fixes_get_show_all
Auto commit by PR queue bot
2015-12-18 20:01:20 -08:00
k8s-merge-robot
9e8233fc3c Merge pull request #17398 from janetkuo/deployment-controller-informer
Auto commit by PR queue bot
2015-12-18 19:13:32 -08:00
Jeff Grafton
f82e8f365e Merge pull request #18916 from timothysc/etcd_TestWatchEtcdError
re-disable TestWatchEtcdError due to flake
2015-12-18 16:52:52 -08:00
Timothy St. Clair
c13e4c8c2f re-disable TestWatchEtcdError due to flake 2015-12-18 17:57:46 -06:00
k8s-merge-robot
977854b8de Merge pull request #17983 from nikhiljindal/updateDocsDoc
Auto commit by PR queue bot
2015-12-18 15:40:43 -08:00
nikhiljindal
37d09ca717 Adding a doc to explain the process of updating release docs 2015-12-18 14:29:51 -08:00
Eric Tune
f15b2e32a7 Merge pull request #16422 from hurf/created_by
Display controllers along with type when describing a pod
2015-12-18 13:44:07 -08:00
k8s-merge-robot
464397e27b Merge pull request #17986 from derekwaynecarr/fix_field_selector
Auto commit by PR queue bot
2015-12-18 13:18:54 -08:00
k8s-merge-robot
229d6ec944 Merge pull request #18863 from spxtr/components-update
Auto commit by PR queue bot
2015-12-18 13:08:45 -08:00
k8s-merge-robot
2fa3568c73 Merge pull request #18844 from spxtr/e2e-cleanup
Auto commit by PR queue bot
2015-12-18 12:49:50 -08:00
k8s-merge-robot
7f5123f61f Merge pull request #18900 from ihmccreery/serial-tests
Auto commit by PR queue bot
2015-12-18 11:56:11 -08:00
Isaac Hollander McCreery
bd49a3420e Add [Disruptive] and [Serial] labels to appropriate tests
And use for partitioning; makes progress toward 10548
2015-12-18 11:12:28 -08:00
k8s-merge-robot
7eda961ada Merge pull request #13838 from mikedanese/go1.5
Auto commit by PR queue bot
2015-12-18 11:09:15 -08:00
k8s-merge-robot
730a6a1d55 Merge pull request #18685 from caesarxuchao/client-gen-output
Auto commit by PR queue bot
2015-12-18 10:55:05 -08:00
k8s-merge-robot
3051fd9bb6 Merge pull request #18873 from caesarxuchao/ignore-ws
Auto commit by PR queue bot
2015-12-18 10:38:56 -08:00
k8s-merge-robot
7dc73a34ac Merge pull request #18856 from pwittrock/etcd2
Auto commit by PR queue bot
2015-12-18 10:38:36 -08:00
k8s-merge-robot
3700036f95 Merge pull request #18847 from caesarxuchao/release-doc
Auto commit by PR queue bot
2015-12-18 10:38:25 -08:00
k8s-merge-robot
40e4ce2879 Merge pull request #18839 from erictune/codecgen-err-msg
Auto commit by PR queue bot
2015-12-18 10:38:15 -08:00
k8s-merge-robot
6f83ff6c8f Merge pull request #18823 from runseb/patch-2
Auto commit by PR queue bot
2015-12-18 10:38:01 -08:00
k8s-merge-robot
ae2fbc6daf Merge pull request #18777 from erictune/image-doc-fix
Auto commit by PR queue bot
2015-12-18 10:37:19 -08:00
k8s-merge-robot
1981c2a640 Merge pull request #18719 from bprashanth/flannel_builder
Auto commit by PR queue bot
2015-12-18 10:36:51 -08:00
k8s-merge-robot
77bf81321f Merge pull request #18550 from janetkuo/get-old-new-rc-test
Auto commit by PR queue bot
2015-12-18 10:35:21 -08:00
k8s-merge-robot
0641e4a8f0 Merge pull request #18417 from Pensu/master
Auto commit by PR queue bot
2015-12-18 10:35:00 -08:00
k8s-merge-robot
60c26c850f Merge pull request #18184 from amygdala/docs
Auto commit by PR queue bot
2015-12-18 10:34:44 -08:00
Mike Danese
cd8dfe70d9 Merge pull request #18836 from mikedanese/daemon-set
increase timeout on complex daemonset test
2015-12-18 08:06:26 -08:00
Wojciech Tyczynski
bf73d1741e Merge pull request #18729 from timstclair/worker-race
Concurrency fixes for prober tests
2015-12-18 16:15:13 +01:00
Wojciech Tyczynski
8c60f53cef Merge pull request #18890 from wojtek-t/fix_etcd_watcher_in_go15
Fix test issue in Go 1.5
2015-12-18 15:31:24 +01:00
Wojciech Tyczynski
96b5ca0cc5 Fix test issue in Go 1.5 2015-12-18 14:17:52 +01:00
Wojciech Tyczynski
8b3c5f97ff Merge pull request #18888 from gmarek/master
Update validate-cluster.sh
2015-12-18 14:16:22 +01:00
Wojciech Tyczynski
d1e039b646 Merge pull request #18635 from timothysc/etcd_client_post_cleanup
Update to use latest etcd client library
2015-12-18 14:14:21 +01:00
Wojciech Tyczynski
f842b53078 Merge pull request #18889 from gmarek/fix-kube-down
Don't fail kube-down if no MIGs are present
2015-12-18 13:16:52 +01:00
gmarek
95f8593898 Update validate-cluster.sh 2015-12-18 12:04:54 +01:00
gmarek
e138ad3d43 Don't fail kube-down if no MIGs are present 2015-12-18 11:12:42 +01:00
Chao Xu
b61c9a4cf3 output of client-gen 2015-12-17 23:42:16 -08:00
Wojciech Tyczynski
98e2ed661d Merge pull request #18881 from wojtek-t/move_kubemark
Move kubemark500 to kubernetes-scale
2015-12-18 08:21:26 +01:00
Wojciech Tyczynski
62c35055ab Move kubemark500 to kubernetes-scale 2015-12-18 08:14:16 +01:00
Janet Kuo
bd1200ba66 Make label and deployment name in deployment e2e test unique 2015-12-17 19:58:48 -08:00
Janet Kuo
1a8f96231a Add expectation model for pod deletion 2015-12-17 19:29:54 -08:00
Janet Kuo
32d153093e Fix deployment tests failures; change ResyncPeriod 2015-12-17 19:29:54 -08:00
Sam Ghods
b838d8ce18 Add informers to deployment controller 2015-12-17 19:29:54 -08:00
Abhi Shah
08c2cba266 Merge pull request #18874 from ArtfulCoder/revert18442
Reverting 18442
2015-12-17 17:31:52 -08:00
Minhan Xia
cbcb3c040e Merge pull request #18783 from freehan/eslogging
increase grace period for elasticsearch cluster to complete master election
2015-12-17 17:31:08 -08:00
Eric Tune
33f1d73967 Update image docs to use .docker/config.json
Documents changes in #12717
2015-12-17 17:28:07 -08:00
Abhishek Shah
6f63875165 Reverting 18442 2015-12-17 16:57:29 -08:00
Chao Xu
785556e79c ignore trailing whitespace and blankline when verify api reference docs 2015-12-17 16:29:28 -08:00
Eric Tune
7ec24ffaab Merge pull request #18870 from erictune/fixbuild
Revert whitespace changes introduced by #17940.
2015-12-17 16:12:11 -08:00
Jeff Lowdermilk
a2f076bdde Merge pull request #18840 from ihmccreery/fix-sdk-cleanup
Remove ~/repo before moving Cloud SDK components there
2015-12-17 16:11:32 -08:00
Eric Tune
9afe694d73 Revert whitespace changes introduced by #17940.
This whitespace different is thought to be breaking
the build.

The differences in white space are hypothesized to happen
because trailing whitespace is chomped by some people's
editors but not others.

The trailing whitespace is enough of a difference to make
hack/verify-api-references-docs.sh think that the
docs are not different.

I think this is not caught by presubmits because different
versions of diff are doing different things with trailing
whitespace, even though `-Bw` flags are passed.
2015-12-17 16:10:55 -08:00
Eric Tune
71018d3af6 Merge pull request #18869 from erictune/fixbuild
Undo unintentional changes to goidl testdata
2015-12-17 16:03:28 -08:00