Commit Graph

25021 Commits

Author SHA1 Message Date
k8s-merge-robot
8a5738c044 Merge pull request #21375 from gmarek/config
Auto commit by PR queue bot
2016-02-19 10:00:56 -08:00
k8s-merge-robot
c3a962bff5 Merge pull request #20351 from krousey/dynamic_client
Auto commit by PR queue bot
2016-02-19 10:00:54 -08:00
k8s-merge-robot
ced1ddfcc7 Merge pull request #21428 from ArtfulCoder/fluentes
Auto commit by PR queue bot
2016-02-19 08:56:10 -08:00
k8s-merge-robot
057b8352ec Merge pull request #21182 from vishh/repoTagsRename
Auto commit by PR queue bot
2016-02-19 08:56:09 -08:00
k8s-merge-robot
4f410d389a Merge pull request #21145 from justinsb/doc_aws_elb_describe
Auto commit by PR queue bot
2016-02-19 08:27:29 -08:00
k8s-merge-robot
921caee646 Merge pull request #21472 from gmarek/kubemark-log
Auto commit by PR queue bot
2016-02-19 08:27:28 -08:00
Jordan Liggitt
81433fb5cf Merge pull request #21539 from deads2k/fix-travis
fix failing travis
2016-02-19 09:21:25 -05:00
Marek Grabowski
d4e70e1aeb Merge pull request #21545 from gmarek/swagger
Update swagger specs
2016-02-19 15:02:34 +01:00
gmarek
6ac6aeb793 Update swagger specs 2016-02-19 14:57:04 +01:00
k8s-merge-robot
62587b66ff Merge pull request #21019 from freehan/estest
Auto commit by PR queue bot
2016-02-19 05:46:23 -08:00
deads2k
50c7e108f0 fix failing travis 2016-02-19 08:09:41 -05:00
k8s-merge-robot
dabc22eef3 Merge pull request #21533 from gmarek/timeout
Auto commit by PR queue bot
2016-02-19 03:57:53 -08:00
gmarek
cc3cf17519 extend timeout in kubemark-scale 2016-02-19 12:01:25 +01:00
k8s-merge-robot
841d3f8311 Merge pull request #21357 from WeixuZhuang/fix
Auto commit by PR queue bot
2016-02-19 02:14:51 -08:00
k8s-merge-robot
68a5641eb8 Merge pull request #20803 from aveshagarwal/master-sortby-indentation-issue
Auto commit by PR queue bot
2016-02-19 00:33:00 -08:00
k8s-merge-robot
5a3dec8dad Merge pull request #20777 from pmorie/kubectl-create-configmap
Auto commit by PR queue bot
2016-02-19 00:03:53 -08:00
k8s-merge-robot
4de373aafd Merge pull request #20714 from fgrzadkowski/push_gcr
Auto commit by PR queue bot
2016-02-18 23:31:13 -08:00
k8s-merge-robot
eb45154996 Merge pull request #21348 from caesarxuchao/generate-fake-for-1-2
Auto commit by PR queue bot
2016-02-18 23:02:05 -08:00
k8s-merge-robot
5d7d0eea2e Merge pull request #20626 from nikhiljindal/serverIPInDiscovery
Auto commit by PR queue bot
2016-02-18 21:53:24 -08:00
k8s-merge-robot
54ecdbc222 Merge pull request #19761 from derekwaynecarr/quota_doc
Auto commit by PR queue bot
2016-02-18 21:23:17 -08:00
k8s-merge-robot
2236c843cd Merge pull request #20458 from freehan/nodedown
Auto commit by PR queue bot
2016-02-18 20:47:06 -08:00
k8s-merge-robot
6be4417aff Merge pull request #17649 from jtblin/jtblin/17647-aws-elb-creation-no-tags
Auto commit by PR queue bot
2016-02-18 19:41:15 -08:00
Phillip Wittrock
4151e96a60 Merge pull request #21510 from jlowdermilk/fix-nodeoutofdisk
Don't call framework.before|afterEach in nodeoutofdisk test
2016-02-18 18:55:32 -08:00
Phillip Wittrock
8151021369 Merge pull request #21508 from mml/slow-flake
Also retain docker and kubelet logs.
2016-02-18 18:53:20 -08:00
Phillip Wittrock
8b05b1585e Merge pull request #21514 from zmerlynn/container-v1-2-v20160218
Bump container-vm in 1.2 to container-v1-2-v20160218
2016-02-18 18:51:40 -08:00
Paul Morie
7a243cb615 Regen for kubectl create configmap 2016-02-18 21:25:31 -05:00
Paul Morie
51a9c2c9ba Add kubectl create configmap 2016-02-18 21:24:21 -05:00
k8s-merge-robot
d792e55e21 Merge pull request #21388 from justinsb/docs_quotas
Auto commit by PR queue bot
2016-02-18 18:23:00 -08:00
k8s-merge-robot
f1cbaed60f Merge pull request #17493 from feihujiang/supportSubresourceOfServiceProxy
Auto commit by PR queue bot
2016-02-18 18:22:59 -08:00
k8s-merge-robot
623d8bd2fd Merge pull request #21495 from robszumski/aws-coreos
Auto commit by PR queue bot
2016-02-18 17:50:48 -08:00
k8s-merge-robot
a5824be157 Merge pull request #21519 from ixdy/jenkins-e2e-master
Auto commit by PR queue bot
2016-02-18 17:14:09 -08:00
Jeff Grafton
74cdfea025 Fix small typo in ubernetes-lite E2E_ZONES
Also fix name of MULTIZONE env var
2016-02-18 17:12:25 -08:00
Minhan Xia
7823d615e8 put block/unblock network function into util 2016-02-18 16:30:41 -08:00
Phillip Wittrock
5fe856c749 Merge pull request #20882 from mikedanese/push-kube-cross
push kube-cross to gcr.io
2016-02-18 16:26:29 -08:00
k8s-merge-robot
1c1c57719a Merge pull request #21515 from ihmccreery/upgrade-target-to-latest
Auto commit by PR queue bot
2016-02-18 16:15:28 -08:00
Phillip Wittrock
644d651c69 Merge pull request #21442 from ixdy/e2e-runner-ginkgo-test-args
Don't bail if GINKGO_TEST_ARGS isn't set
2016-02-18 16:07:11 -08:00
Phillip Wittrock
c6fea28e83 Merge pull request #21368 from timstclair/summary-api
Move stats summary types to a new kubelet/api package to avoid unnece…
2016-02-18 16:05:34 -08:00
Isaac Hollander McCreery
194abade89 Default upgrade-target (ci/latest) for upgrade jobs on master 2016-02-18 15:10:35 -08:00
k8s-merge-robot
d8c493a274 Merge pull request #21496 from ncdc/fix-ds-type-in-nodecontroller-informer
Auto commit by PR queue bot
2016-02-18 15:01:14 -08:00
Zach Loafman
7f94e3ecdc Bump container-vm in 1.2 to container-v1-2-v20160218 (prerelease) 2016-02-18 15:00:50 -08:00
Jeff Lowdermilk
71febf4b24 Don't call framework.before|afterEach in nodeoutofdisk test 2016-02-18 14:33:04 -08:00
k8s-merge-robot
a39b62bb22 Merge pull request #21417 from yujuhong/docker_container
Auto commit by PR queue bot
2016-02-18 14:31:37 -08:00
Zach Loafman
6fe3023a3d Revert "Upgrade gce cluster to docker 1.9.1"
This reverts commit f07070d129.
2016-02-18 14:28:13 -08:00
Matt Liggett
58283aff67 Also retain docker and kubelet logs.
Still trying to debug #20916
2016-02-18 13:32:18 -08:00
nikhiljindal
20ce4aed0e Adding hostname to groups discovery information 2016-02-18 11:58:11 -08:00
Andy Goldstein
49fb450a36 Fix type for DaemonSet informer 2016-02-18 14:54:39 -05:00
Rob Szumski
6e4e5e0e1b docs: update alternative to official CoreOS guide 2016-02-18 11:46:43 -08:00
Rob Szumski
ac218b3d00 docs: add AWS to list of CoreOS guides 2016-02-18 11:46:11 -08:00
Phillip Wittrock
be803eaf64 Merge pull request #21439 from zmerlynn/container-vm-v20160217
Bump GCE to container-vm-v20160217
2016-02-18 11:39:54 -08:00
Jeff Grafton
68fddbdfad Don't bail if GINKGO_TEST_ARGS isn't set 2016-02-18 11:31:58 -08:00