8494 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Derek Carr	2af9b54147	Merge pull request #6259 from zmerlynn/fix_cloud_provider ... Eliminate grains.cloud_provider (in preference to grains.cloud) from SaltStack	2015-04-01 17:04:05 -04:00
Vish Kannan	d010b2a34e	Merge pull request #5560 from erictune/secrets_doc ... Secrets doc	2015-04-01 13:24:19 -07:00
Brian Grant	7450da41f1	Merge pull request #6094 from ddysher/remove-reachability ... Remove Reachable Condition	2015-04-01 13:16:47 -07:00
Zach Loafman	ba22494e5f	Merge pull request #6305 from jlowdermilk/remove-unused-vars ... Remove unused variables from build scripts	2015-04-01 12:58:44 -07:00
Zach Loafman	8078a6ac3d	Merge pull request #6221 from ArtfulCoder/etcd_pod ... Run etcd 2.0.5 in a pod	2015-04-01 12:54:46 -07:00
Zach Loafman	04026efa17	Merge pull request #6303 from roberthbailey/liveness-sh ... Remove liveness.sh.	2015-04-01 12:45:59 -07:00
Jeff Lowdermilk	45639d9e2d	Remove unused variables from build scripts	2015-04-01 12:28:31 -07:00
Robert Bailey	836fb4ac0b	Remove liveness.sh.	2015-04-01 11:56:39 -07:00
Abhishek Shah	8e3a41b52c	Run etcd 2.0.5 in a pod	2015-04-01 11:38:21 -07:00
Deyuan Deng	6bb9701489	Remove Reachable Condition	2015-04-01 13:56:43 -04:00
Eric Tune	92b6f49b3c	Merge pull request #6243 from roberthbailey/kubelet-ssl ... Configure the kubelet to use HTTPS	2015-04-01 10:33:15 -07:00
Zach Loafman	f7f133784f	Merge pull request #6268 from jlowdermilk/e2e-gcr ... Pull e2e images from gcr.io	2015-04-01 10:01:57 -07:00
Jeff Lowdermilk	2d8e93f8b4	e2e images pulled from gcr.io	2015-04-01 09:18:03 -07:00
Jeff Lowdermilk	506887515d	Rename google-containers to google_containers in image names	2015-04-01 09:16:48 -07:00
Robert Bailey	dd9ec46cc0	Fix test-cmd to work with the kubelet listening on HTTPS.	2015-04-01 09:09:29 -07:00
Robert Bailey	58bc792e68	Configure the master to connect to the kubelet using HTTPS.	2015-04-01 09:09:29 -07:00
Robert Bailey	d0f48b68d8	Configure the Kubelet to listen on HTTPS. If no certificates are ... provided on the command line, generate self-signed certs.	2015-04-01 09:09:29 -07:00
Victor Marmol	fb1a8219d4	Merge pull request #6296 from yujuhong/timeout ... Increase the timeouts in integration test	2015-04-01 08:56:08 -07:00
Zach Loafman	66d37b56fd	Merge pull request #6297 from pmorie/fix-6294 ... Fix issue 6294: networking e2e should set args, not command	2015-04-01 08:51:48 -07:00
Paul Morie	0335e350c7	Fix issue 6294: networking e2e should set args, not command	2015-04-01 11:40:23 -04:00
Yu-Ju Hong	4d28ad36ca	Increase the timeouts in integration test ... There has been test flakes on Shippable caused by timeout waiting for pods to be running. Increase the timeouts to alleviate the problem.	2015-04-01 08:34:14 -07:00
Zach Loafman	b581320bf7	Eliminate grains.cloud_provider (in preference to grains.cloud) from SaltStack ... This variable can be entirely derived from grains.cloud, and it simplifies the configuration somewhat. (Or someone convince me I'm wrong. I'm happy to be wrong here.)	2015-04-01 08:32:32 -07:00
Derek Carr	762c449043	Merge pull request #6262 from zmerlynn/rm_master_ip ... rm Salt grains.master_ip	2015-04-01 11:10:48 -04:00
gmarek	b9babb56b0	Merge pull request #6283 from AntonioMeireles/fix_typo ... Fix typo in spelling in cluster/vagrant/util.sh.	2015-04-01 13:59:30 +02:00
António Meireles	7680c2f771	fix typo in spelling. ... Signed-off-by: António Meireles <antonio.meireles@reformi.st>	2015-04-01 10:43:52 +01:00
Filip Grzadkowski	151b2efa20	Merge pull request #6274 from wojtek-t/dont_run_density ... Don't run Density test in e2e runs until #6059 is fixed	2015-04-01 10:49:20 +02:00
Wojciech Tyczynski	c5597efc0c	Don't run Density test in e2e runs until #6059 is fixed	2015-04-01 09:23:09 +02:00
Piotr Szczesniak	81683441b9	Merge pull request #6156 from gmarek/retry_loop ... Add a retry loop to UpdateStatus in NodeController	2015-04-01 09:16:11 +02:00
Zach Loafman	0806e3bde0	rm Salt grains.master_ip ... This appears in the Salt documentation, is set by Vagrant, but has no consumers. Remove vestigial references.	2015-03-31 17:31:47 -07:00
Victor Marmol	2de37624e8	Merge pull request #6252 from krousey/string_format_cleanup ... Fixing a lot of string formatting issues	2015-03-31 16:57:36 -07:00
Zach Loafman	7094badf94	Merge pull request #6258 from zmerlynn/fix_gke_util ... Fix gke/util.sh	2015-03-31 16:51:03 -07:00
Zach Loafman	52dd55c5ec	Fix gke/util.sh	2015-03-31 16:50:31 -07:00
Kris Rousey	6904c4d585	Fixing a lot of string formatting issues with regards to: ... * Improper format specifier (e.g. %s for bools or %s for ints) * More or less parameters than format specifiers * Not calling a formatting function when it should have (e.g. Error() instead of Errorf())	2015-03-31 16:47:10 -07:00
Victor Marmol	151b916d47	Merge pull request #6253 from satnam6502/dedash ... Rename logging images to use google_containers	2015-03-31 16:17:20 -07:00
Satnam Singh	73a9ab2928	Rename logging image to use google_containers	2015-03-31 16:00:52 -07:00
Victor Marmol	08af9dbe24	Merge pull request #6250 from TamerTas/typo ... Fix typo in /docs/design/secrets.md	2015-03-31 15:34:16 -07:00
Brian Grant	af858c99e2	Merge pull request #6098 from nikhiljindal/enableInMaster ... Enabling v1beta3 api version by default in master	2015-03-31 15:31:18 -07:00
Tamer Tas	e5f29b915d	Fix typo in Secrets design document	2015-04-01 01:18:49 +03:00
Victor Marmol	f4a71cccd2	Merge pull request #6248 from dchen1107/docker ... Makefile for build pause image and push to gcr.io	2015-03-31 15:18:37 -07:00
Victor Marmol	a78a009877	Merge pull request #6249 from TamerTas/typo ... Fix typo in Secrets	2015-03-31 15:14:55 -07:00
Daniel Smith	bb0f613d5e	Merge pull request #6202 from abhgupta/abhgupta-dev ... Adding validations for scheduler Policy	2015-03-31 15:13:21 -07:00
Dawn Chen	48cd904a20	Makefile for build pause image and push to gcr.io	2015-03-31 15:07:03 -07:00
Eric Tune	a1c36972a0	Added documentation for Secrets.	2015-03-31 15:02:35 -07:00
Tamer Tas	6c10cf7b98	Fix typo in Secrets	2015-04-01 00:56:20 +03:00
Victor Marmol	334ec0c866	Merge pull request #6244 from pmorie/build-typo ... Fix typo in std install instructions for build	2015-03-31 14:56:08 -07:00
Victor Marmol	44fda1fcd1	Merge pull request #6161 from justinsb/populate_addresses_new_nodes ... Make sure we have addresses for newly discovered nodes	2015-03-31 14:46:06 -07:00
Victor Marmol	d80ac514df	Merge pull request #6224 from pmorie/e2e-refactor ... Extract testContainerOutput method from e2e tests	2015-03-31 14:45:02 -07:00
Paul Morie	fdae6748d2	Fix typo in std install instructions for build	2015-03-31 17:36:47 -04:00
Brian Grant	00cb644f45	Merge pull request #6242 from thockin/plural_services_20 ... Fix a back-compat bug in multi-port services	2015-03-31 14:32:20 -07:00
Tim Hockin	70b9e56952	Fix a back-compat bug in multi-port services ... Yu-Ju changed something just before this went in that exposed this bug. we did not re-run Travis on my PR. Bad us.	2015-03-31 14:29:22 -07:00