5821 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Brendan Burns	94d852e8a6	Merge pull request #4214 from brendandburns/pd_fix ... Revert "Start using GCE safe format and mount for mounting disks."	2015-02-06 09:58:51 -08:00
Brendan Burns	858a85e8fe	Revert "Start using GCE safe format and mount for mounting disks." ... This reverts commit 3f109d6d46.	2015-02-06 09:58:03 -08:00
Dawn Chen	05de54249f	Merge pull request #4191 from simon3z/master ... api: add image's id to ContainerStatus	2015-02-06 09:35:44 -08:00
Dawn Chen	8eeb2d1358	Merge pull request #4206 from saad-ali/modifyEventStruct ... Modify Event struct to allow compressing multiple recurring events in to a single event	2015-02-06 09:32:50 -08:00
Filipe Brandenburger	36b063ddd0	Merge pull request #4207 from zmerlynn/gingko_flags ... Move verbosity flag into driver.go, randomize specs	2015-02-06 09:21:12 -08:00
Federico Simoncelli	e01df69565	api: add image's id to ContainerStatus ... Sometimes for external applications it is important to identify exactly what images are running. Since tags can be moved to point to newer builds this information can be used to identify old images running. Signed-off-by: Federico Simoncelli <fsimonce@redhat.com>	2015-02-06 09:01:14 -05:00
saadali	79cbcf918e	Modify Event struct to allow compressing multiple recurring events in to a single event. ... # *** ERROR: *** Some API files are missing the required field descriptions # Add description tags to all non-inline fields in the following files: # pkg/api/v1beta1/types.go # pkg/api/v1beta2/types.go # # Your commit will be aborted unless you fix these. # COMMIT_BLOCKED_ON_DESCRIPTION	2015-02-05 21:50:29 -08:00
Brendan Burns	ff4c23d803	Merge pull request #4208 from brendandburns/e2e2 ... Revert filtering unknown pods, as I believe that it is causing e2e flakes.	2015-02-05 21:46:13 -08:00
Brendan Burns	234f951867	Revert filtering unknown pods, as I believe that it is causing e2e flakes.	2015-02-05 20:57:01 -08:00
Zach Loafman	134d332793	Move verbosity flag into driver.go, randomize specs ... Before we get too many suites baked, I want to get spec randomization in, just so no one accidentally thinks things flow from top to bottom. The random seed is printed with every run: Random Seed: 1423194521 - Will randomize all specs and can be reproduced using --ginkgo.seed	2015-02-05 19:49:04 -08:00
Zach Loafman	c5fcd9d568	Merge pull request #4205 from jlowdermilk/gce-kube-up ... Use kubectl config -o template to get password in gce kube-up	2015-02-05 18:43:32 -08:00
Brian Grant	617e1ca7de	Merge pull request #3956 from proppy/go2docker ... contrib: add go2docker	2015-02-05 17:24:59 -08:00
Brian Grant	d2feaade9e	Merge pull request #4195 from smarterclayton/add_endpoints_to_service ... Kubectl should be able to display endpoints directly and for service	2015-02-05 17:22:34 -08:00
Brian Grant	175e9caa55	Merge pull request #4194 from dchen1107/podstatus ... Kubelet decides podStatus	2015-02-05 17:18:39 -08:00
Tim Hockin	fcb739f284	Merge pull request #4197 from brendandburns/pd ... Start using GCE safe format and mount for mounting disks.	2015-02-05 17:08:54 -08:00
Brendan Burns	3f109d6d46	Start using GCE safe format and mount for mounting disks. ... This removes the need for disks to be formatted.	2015-02-05 17:01:37 -08:00
Tim Hockin	7c5625b2dd	Merge pull request #4120 from justinsb/fix_4118 ... Fix enable_cluster_dns test	2015-02-05 16:28:46 -08:00
Tim Hockin	ae6e25f4af	Merge pull request #4001 from mikedanese/probe-result ... rename probe.Status to probe.Result	2015-02-05 16:12:13 -08:00
Dawn Chen	4da829ef20	comment.	2015-02-05 15:57:26 -08:00
Mike Danese	14bfec92f2	rename probe.Status to probe.Result.	2015-02-05 15:49:58 -08:00
Dawn Chen	f762e062f2	Kubelet decides podStatus	2015-02-05 15:49:41 -08:00
Clayton Coleman	698e8dd06f	Kubectl should be able to display endpoints directly and for service ... kubectl get endpoints <servicename> kubectl describe service <servicename> should have printers for endpoints	2015-02-05 18:46:09 -05:00
Brendan Burns	8e6f5c7201	Merge pull request #3593 from commonlisp/master ... Add timeouts to HealthChecks and retry checks	2015-02-05 15:40:22 -08:00
Brendan Burns	50e855953f	Merge pull request #4131 from a-robinson/validate ... Add a few extra test cases for API validation of labels	2015-02-05 15:37:45 -08:00
Zach Loafman	963c4d38d1	Merge pull request #4193 from rsokolowski/fix-e2e ... Fix hack/e2e-test.sh broken due to removed flag from hack/e2e.go	2015-02-05 15:29:06 -08:00
Jeff Lowdermilk	122124f9e1	Merge pull request #4175 from wojtek-t/kubectl_silent ... kubectl doesn't fail silently with no k8s master	2015-02-05 14:58:24 -08:00
rsokolowski	df26b43a9d	Fix hack/e2e-test.sh broken due to removed flag from hack/e2e.go	2015-02-05 23:56:43 +01:00
Jeff Lowdermilk	8f6d9c1039	Use config output formatting to get password in gce kube-up ... Gets rid of e2e dependency on pyyaml.	2015-02-05 14:54:45 -08:00
Brendan Burns	b08bd8671f	Merge pull request #4157 from saad-ali/updateEventApi ... Add "Update Event" to Kubernetes API	2015-02-05 14:50:48 -08:00
Brendan Burns	775a04c230	Merge pull request #4167 from eparis/unit-quotes ... Do not use {} in systemd environment variables	2015-02-05 14:49:08 -08:00
Brendan Burns	f153a27235	Merge pull request #4147 from jlowdermilk/kubeconfig-view ... Allow output formatting for kubectl config view	2015-02-05 14:48:02 -08:00
Brendan Burns	7a21bed3c7	Merge pull request #4190 from zmerlynn/kill_e2e_timeout ... Remove timeout from cmd/e2e now that all tests are under it	2015-02-05 14:45:17 -08:00
Zach Loafman	9261c5a655	Remove timeout from cmd/e2e now that all tests are under it	2015-02-05 14:35:24 -08:00
Filipe Brandenburger	5de4c49792	Merge pull request #4153 from brendandburns/e2e ... Add a simple endpoints test.	2015-02-05 13:54:33 -08:00
Tim Hockin	a20fb598bc	Merge pull request #4132 from jszczepkowski/master ... Improve "constraint violation" error message.	2015-02-05 13:43:29 -08:00
Brian Grant	7a13c2f0e3	Merge pull request #4169 from brendandburns/shell_sucks ... Fix a regression where we never cleared out failed nodes.	2015-02-05 13:41:11 -08:00
Brian Grant	c1ca07338f	Merge pull request #4149 from nikhiljindal/autoSwaggerSpec ... Adding static swagger spec and a script to update it	2015-02-05 12:13:33 -08:00
Zach Loafman	3fbfecccff	Merge pull request #4163 from rrati/e2e-services-4162 ... E2e services 4162	2015-02-05 12:06:37 -08:00
nikhiljindal	fe27529d7e	Adding static swagger spec and a script to update it	2015-02-05 12:00:28 -08:00
CJ Cullen	079dd4dba6	Merge pull request #4172 from mike-schiller/aws_cf_user_data_fix ... fixes kube-apiserver failure when using aws/cloudformation-template.json	2015-02-05 11:37:08 -08:00
Jerzy Szczepkowski	18c5fa1ae7	Applied comments.	2015-02-05 20:32:51 +01:00
Zach Loafman	9674939860	Merge pull request #4178 from zmerlynn/jenkins_fix_status ... Breakfix for #4177, not a real solution	2015-02-05 11:25:39 -08:00
Zach Loafman	49a1984e98	Breakfix for #4177, not a real solution	2015-02-05 11:24:45 -08:00
Brendan Burns	6d0b8ea7a7	Fix a regression where we never cleared out failed nodes.	2015-02-05 10:55:57 -08:00
Jeff Lowdermilk	5a702ad123	Allow --output formatting of kubectl config view, make merge default	2015-02-05 10:44:16 -08:00
Wojciech Tyczynski	9d9bca9958	kubectl doesn't fail silently with no k8s master	2015-02-05 19:37:20 +01:00
CJ Cullen	3a16a9c39e	Merge pull request #4161 from pierredup/patch-1 ... Typo	2015-02-05 10:36:08 -08:00
Zach Loafman	f904484b38	Merge pull request #4173 from zmerlynn/fix_jenkins_3 ... Revert jenkins/e2e.sh back to 606b517a, minus -tap	2015-02-05 10:30:00 -08:00
Zach Loafman	c15595fdf7	Revert jenkins/e2e.sh back to 606b517a, minus -tap	2015-02-05 10:25:59 -08:00
Robert Rati	70237e9cc6	Changed to return in the success case testing testContext instead of using ... an else statement. #4162	2015-02-05 13:09:46 -05:00