689 Commits

Author	SHA1	Message	Date
Satnam Singh	9cdc7bdef3	Documentation for logging with Elasticsearch and Kibana	2015-06-23 14:02:24 -07:00
Janet Kuo	78e9dd3399	Add a link for how to enable API in developers console.	2015-06-23 11:56:59 -07:00
Jeff Lowdermilk	8a92232f66	Merge pull request #10203 from satnam6502/logging-doc ... Update Getting Started logging docs for Cloud Logging	2015-06-23 11:50:39 -07:00
Satnam Singh	90caacbfd7	Update logging docs	2015-06-23 11:28:34 -07:00
Eric Tune	6dd499aa4c	Fix formatting in fedora manual getting-started.	2015-06-23 08:25:02 -07:00
Eric Tune	1767553377	Fix indentation of ToC in Getting-Started-Guides..	2015-06-23 08:20:31 -07:00
Amy Unruh	30e0b808f7	gce getting started clarifications	2015-06-22 18:46:16 -07:00
Jeff Lowdermilk	e75edf2282	Merge pull request #10191 from erictune/similar-structure-gsg ... Getting started guide cleanup	2015-06-22 16:29:51 -07:00
Jeff Lowdermilk	b80392737e	Merge pull request #10189 from erictune/toc-gsg ... Add tables of contents to getting started guides.	2015-06-22 16:25:07 -07:00
Eric Tune	179fa8cb61	Getting-started-guide cleanup. ... Put a Prerequisites section in all the hosted gettting-started-guides. Change how title and contents are formatted so they are not automatically included in the ToC. Tweak other section headers to improve ToCs.	2015-06-22 12:39:35 -07:00
Eric Tune	f39eead95c	Add tables of contents to getting started guides.	2015-06-22 11:56:19 -07:00
Ács Sándor	a2572514e3	Use vagrant command instead of salt.	2015-06-22 11:36:20 +02:00
Dawn Chen	07506763a5	Small nit cleanup for getting-started-guides	2015-06-17 15:49:14 -07:00
Saad Ali	92e5992489	Merge pull request #9780 from amygdala/gettingstarted ... gce 'getting started' cleanup.	2015-06-16 18:46:18 -07:00
Brendan Burns	d18dcabca5	Merge pull request #9786 from ZJU-SEL/UpdateDockerK8s ... Update docker k8s approach	2015-06-16 15:53:25 -07:00
Saad Ali	9fd02fcf7f	Merge pull request #9811 from erictune/matrix ... Add conformance column to matrix.	2015-06-16 14:52:26 -07:00
Eric Tune	73e873dc12	Change docs/getting-started-guides/README.md ... Reformats. Remove duplicate rows. Adds empty conformance test column. (more on this soon.)	2015-06-16 10:41:07 -07:00
Amy Unruh	1b22ca11f8	gce 'getting started' cleanup.	2015-06-15 19:52:21 -07:00
wizard	4e92f409a0	update docker k8s approach	2015-06-16 09:44:21 +08:00
Fabio Yeon	188f52a090	Merge pull request #9466 from syst3mw0rm/master ... Version bump to 0.18.2	2015-06-15 10:15:05 -07:00
Abhi Shah	1f952b05d3	Merge pull request #9652 from epc/epc-2015162 ... Copy edits for spelling errors and typos	2015-06-12 16:59:32 -07:00
Abhi Shah	4da902c72e	Merge pull request #9579 from doublerr/rackspace/update_flannel ... simplify flannel configuration on rackspace	2015-06-12 16:58:36 -07:00
Ed Costello	05714d416b	Copy edits for spelling errors and typos ... Signed-off-by: Ed Costello <epc@epcostello.com>	2015-06-12 18:47:28 -04:00
Abhi Shah	f345432b53	Merge pull request #9651 from brendandburns/rev-docker ... Update Docker instructions.	2015-06-12 13:54:09 -07:00
Abhi Shah	b56034a90e	Merge pull request #9667 from mesosphere/link-to-known-issues ... link to k8s-mesos known issues	2015-06-11 11:53:41 -07:00
James DeFelice	dd8077e276	link to k8s-mesos known issues	2015-06-11 15:10:32 +00:00
jayunit100	210ad819b1	Some minor README updates (readability/selinux/k8petstore)	2015-06-11 09:00:15 -04:00
Brendan Burns	4b904c34a8	Update Docker instructions.	2015-06-10 21:40:06 -07:00
Abhi Shah	04ae4d07e1	Merge pull request #9551 from brendandburns/docsfix ... Make it clear which part should be supplied by the user.	2015-06-10 14:49:37 -07:00
Ryan Richard	0b26e4e301	simplify flannel configuration on rackspace	2015-06-10 16:07:23 -05:00
Brendan Burns	0dfb681ba5	Revert change from run-container to run.	2015-06-09 22:08:52 -07:00
Brendan Burns	b3faaab0bb	Make it clear which part should be supplied by the user.	2015-06-09 20:19:16 -07:00
Brendan Burns	9e198a6ed9	Purge cluster/kubectl.sh from nearly all docs. ... Mark cluster/kubectl.sh as deprecated.	2015-06-09 13:35:52 -07:00
Kathrin Probst	d7c07b0def	Simplify getting started guide by providing only one download option. Advanced user can still see the wget option when looking at https://get.k8s.io.	2015-06-09 09:01:58 -07:00
Aamir Khan	cbde182b34	Version bump to 0.18.2 ... Fixes #9323	2015-06-09 18:41:42 +09:00
krousey	e497793de2	Merge pull request #9366 from justinsb/fix_8376 ... Correct arguments to aws cloudformation command in docs	2015-06-08 12:55:36 -07:00
krousey	45331099f3	Merge pull request #9379 from rimusz/master ... coreos.md update	2015-06-08 11:09:14 -07:00
Patrick Reilly	5d5a1abae6	Update Vagrant guide to use new term nodes	2015-06-08 08:41:28 -07:00
rimusz	62bd233e82	coreos.md update	2015-06-07 20:55:19 +01:00
Justin Santa Barbara	238be703d7	Correct arguments to aws cloudformation command in docs ... Fix #8376	2015-06-06 12:51:40 -04:00
Kris Rousey	6e83eb2636	Updating docs/ to v1	2015-06-05 14:09:49 -07:00
Mike Danese	d326de9b6c	Merge pull request #9319 from skonzem/fix_doc_typos ... Fix misspellings in documentation	2015-06-05 12:00:37 -07:00
Quinton Hoole	9ebeea1d83	Merge pull request #9303 from doublerr/rackspace/18.1 ... remove kube-register and update config-default	2015-06-05 11:58:05 -07:00
Scott Konzem	1cff55f874	Fix misspellings in documentation	2015-06-05 11:35:17 -04:00
Ryan Richard	ab0a3a1f84	remove kube-register and update config-default ... * use newer rackspace cloud flavor names * update coreos (beta) image id * use NUM_MINIONS instead of RAX_NUM_MINIONS	2015-06-05 10:01:01 -05:00
Joerg Schad	c3baeff6e1	Removed deprecated reference to ElasticMesos from Mesos Getting-Started-Guide. ... As the ElasticMesos will be shutdown in the near future we need to update the tutorial.	2015-06-04 14:39:07 +02:00
Daniel Smith	5d6b8d7de6	doc updates	2015-06-03 15:41:09 -07:00
Brian Grant	600d59d544	Merge pull request #9111 from combor/version_bump ... Version bump to 0.18.0	2015-06-02 13:10:40 -07:00
Piotr Komborski	ddb10e87f8	Version bump to 0.18.0	2015-06-02 11:35:48 +01:00
wizard	73b7128941	bump the k8s version to 0.18.0	2015-06-02 13:18:45 +08:00
Eric Tune	5520386b18	Merge pull request #9060 from errordeveloper/master ... coreos/azure: Version bump and doc update	2015-06-01 16:45:57 -07:00
Eric Tune	474860a0c1	Merge pull request #9061 from stevesloka/master ... Added note about AWS env variable to specify location of private key	2015-06-01 16:44:39 -07:00
Rohit Jnagal	ebd4506a59	Merge pull request #9004 from bakins/rkt-aws ... Add AWS instructions for rkt on CoreOS	2015-06-01 10:34:57 -07:00
Eric Tune	1d2138ce44	Merge pull request #8994 from AntonioMeireles/etcd2011_fix ... CoreOS cloud-configs - get nodes working in CoreOS 695.0.0+	2015-06-01 10:29:51 -07:00
Eric Tune	be2e61d069	Merge pull request #8986 from ZJU-SEL/fix-util.sh ... Add trap-add in util.sh	2015-06-01 10:27:49 -07:00
Brian Akins	7b3db82faa	Add AWS instructions.	2015-06-01 10:17:01 -07:00
Rohit Jnagal	e18e39ed3e	Add clarifications to gce getting started guide. ... Based on last week's UX study: . Mention that instance groups API needs to be enabled. . Add link to cloud SDK. . Add more info on cluster addon that show up on bringup.	2015-06-01 17:00:29 +00:00
Steve Sloka	7578da1719	Added note about AWS env variable to specify location of private key	2015-06-01 09:19:17 -04:00
Ilya Dmitrichenko	3e813bfbe0	coreos/azure: Version bump and doc update - ... - Kubernetes 0.18.0 - etcd 2.0.11 - CoreOS 647.0.0	2015-06-01 14:03:05 +01:00
Rohit Jnagal	f5276894a6	Merge pull request #9003 from bakins/rkt-docs ... Add explicitly setting the runtime and option to set rkt version	2015-05-29 14:16:06 -07:00
Rohit Jnagal	0afb34d93c	Merge pull request #8966 from caesarxuchao/coreos-getting-started-guides ... let the coreos bare_metal_offline.md point to examples/ rather than having its own examples	2015-05-29 09:32:55 -07:00
Rohit Jnagal	df1f851267	Merge pull request #8963 from caesarxuchao/fedora-getting-started-guides ... update fedora_ansible_config.md to v1beta3	2015-05-29 09:32:13 -07:00
Rohit Jnagal	bb2f0b6577	Merge pull request #8961 from caesarxuchao/juju ... update getting-started-guides/juju.md to v1beta3	2015-05-29 09:31:33 -07:00
Brian Akins	5dfeac69bb	Add prompt to match style	2015-05-29 09:17:06 -04:00
Brian Akins	9011600b1e	Add explicitly seting the runtime and option to set rkt version	2015-05-29 09:13:53 -04:00
António Meireles	dfb768eda2	CoreOS cloud-configs - get nodes working in CoreOS 695.0.0+ ... etcd 2.0.11 behavior changed. (github.com/coreos/etcd#2761) Signed-off-by: António Meireles <antonio.meireles@reformi.st>	2015-05-29 09:54:11 +01:00
resouer	c86e626e35	Add trap-add in util.sh	2015-05-29 11:04:47 +08:00
Tim Hockin	b16dd72e36	run gendocs	2015-05-28 17:05:02 -07:00
Tim Hockin	e3283b700d	Merge pull request #8968 from yifan-gu/rkt_doc ... docs: Add README for getting started with rkt.	2015-05-28 16:54:10 -07:00
Yifan Gu	e5d8a21290	docs: Add README for getting started with rkt.	2015-05-28 16:28:02 -07:00
Tim Hockin	e13d6078de	Final pass looking for errant 'portal' strings	2015-05-28 16:10:44 -07:00
Tim Hockin	ac3cc3c518	Rename PORTAL_NET all over	2015-05-28 16:10:44 -07:00
Tim Hockin	3005471100	Add new apiserver flags for clusterIP (nee portal) ... Leave old flags but marked as deprecated	2015-05-28 16:10:44 -07:00
Tim Hockin	4318ca5a8b	Rename 'portal IP' to 'cluster IP' most everywhere ... This covers obvious transforms, but not --portal_net, $PORTAL_NET and similar.	2015-05-28 16:10:44 -07:00
Chao Xu	ba1f8209fe	let the coreos bare_metal_offline.md point to examples/ rather than having its own examples	2015-05-28 15:57:34 -07:00
Chao Xu	4ef7b33d4c	update fedora_ansible_config.md to v1beta3	2015-05-28 15:43:09 -07:00
Tim Hockin	3274bd0674	Merge pull request #8952 from rjnagal/rc ... Updated broken ordering of prerequisites.	2015-05-28 15:28:54 -07:00
Chao Xu	bac48b4120	update getting-started-guides/juju.md to v1beta3, following 4f1fe55a9e	2015-05-28 15:25:10 -07:00
Rohit Jnagal	a796fb0187	Updated broken ordering of prerequisites.	2015-05-28 21:15:17 +00:00
Chao Xu	6a38836496	let azure getting started guides point to examples/	2015-05-28 13:19:22 -07:00
Alex Robinson	b7b89c4734	Merge pull request #8842 from goltermann/docs ... Docs	2015-05-27 18:52:25 -07:00
Anastasis Andronidis	9e3a540940	rename resize to scale	2015-05-27 19:08:06 +02:00
Anastasis Andronidis	d4a47bdb9e	rename run-container to run in kubectl	2015-05-27 19:07:17 +02:00
Saad Ali	441b690204	Merge pull request #8785 from aveshagarwal/kubernetes-fixes ... Updating systemd service and environ files for controller-manager as --machines is deprecated.	2015-05-26 18:52:25 -07:00
Saad Ali	2c92915f63	Merge pull request #8752 from ZJU-SEL/Fix#8373 ... Fix #8373 add kubectl for cluster validation	2015-05-26 18:29:07 -07:00
goltermann	5b228bd09a	Updates after review.	2015-05-26 18:22:48 -07:00
Saad Ali	705c2a7dc5	Merge pull request #8810 from combor/master ... Replaced all ocurances of wget with curl.	2015-05-26 17:49:58 -07:00
goltermann	723ab9cf11	Changes for 8690, 8689, 8350, 8346	2015-05-26 16:50:36 -07:00
Kelsey Hightower	17e827407d	Merge pull request #8719 from kamalmarhubi/guide-coreos-explain-min-version ... Explain that CoreOS 653.0.0+ is required for etcd2	2015-05-26 11:15:05 -07:00
Piotr Komborski	a4149f3971	Fix for 403 Forbidden while using -N flag with wget	2015-05-26 16:33:01 +01:00
Piotr Komborski	6556e71af6	Replaced all ocurances of wget with curl. I'm getting 403 from S3 while using -N flag for wget	2015-05-26 16:03:10 +01:00
Avesh Agarwal	f9d8212ff9	Updating systemd service and enviorn files for controller-manager as ... --machines is deprecated.	2015-05-25 11:25:16 -04:00
wizard	ca0d82dd44	add kubectl fix#8373	2015-05-24 16:33:11 +08:00
Kamal Marhubi	bbcbbc9713	Explain that CoreOS 653.0.0+ is required for etcd2 ... This way inquisitive people won't have to check the blame to see why that version is required.	2015-05-22 16:21:19 -07:00
Dawn Chen	3e57c7e97b	Merge pull request #8664 from crossorigin/master ... coreos/azure add addons and bump fluentd	2015-05-22 14:59:37 -07:00
Dawn Chen	a823f6d1d5	Merge pull request #8558 from ZJU-SEL/updateEtcd ... Update etcd version to 2.0.9 for ubuntu k8s	2015-05-22 12:35:53 -07:00
Ido Shamun	6142e27200	coreos/azure add addons and bump fluentd	2015-05-22 14:26:27 +03:00
Robert Bailey	784c0e22eb	Merge pull request #8323 from errordeveloper/master ... coreos/azure: Kubernetes version bump to 0.17, various other fixes	2015-05-21 10:18:50 -07:00
Dawn Chen	e7a2a5b23c	Merge pull request #8605 from philips/patch-3 ... coreos: standalone: start etcd2	2015-05-21 09:51:39 -07:00
Dawn Chen	9ae7457536	Merge pull request #8606 from philips/patch-4 ... docs: fedora: fix manual instructions	2015-05-21 09:50:27 -07:00
Dawn Chen	fdb44a9ad2	Merge pull request #8602 from caesarxuchao/rC-to-rc ... in docs, update replicationController to replicationcontroller	2015-05-21 09:49:35 -07:00
Harry Zhang	432e53556d	Minor fix in ubuntu deploy guide	2015-05-21 15:21:26 +00:00
wizard	a070bad50f	update etcd version to 2.0.9 for ubuntu k8s	2015-05-21 12:51:39 +08:00
Brandon Philips	58b1db3787	docs: fedora: fix manual instructions ... Fix up a some commas	2015-05-20 22:07:09 -06:00
Brandon Philips	27a88b645e	standalone: start etcd2 ... We are configuring etcd2 but starting the old etcd service. This will work on a single machine but isn't the user's intention. This is untested, I just wanted to fix it first.	2015-05-20 22:03:09 -06:00
Chao Xu	5b8b5a0844	in docs, update replicationController to replicationcontroller	2015-05-20 17:31:15 -07:00
Ilya Dmitrichenko	ea6847a74f	coreos/azure: Kubernetes version bump to 0.17 ... - Bump CLI tools version to 0.9.2 - Add curl wrapper as Azure DNS seems flaky - Bump to 0.17 - Bump CoreOS image IDs - Update docs URLs - Fix permissions - Always restart Weave services (coreos/bugs#334)	2015-05-20 13:20:03 +01:00
Eric Tune	f85e6bcf74	Merge pull request #8502 from whitmo/juju-petstore-action ... Juju provider petstore action & kubectl.sh fix	2015-05-19 12:20:23 -07:00
Yu-Ju Hong	8e5d78c687	Merge pull request #8485 from brendandburns/docker ... More fixes for release 0.17.0	2015-05-19 12:06:00 -07:00
Eric Tune	dc81fe1f12	Merge pull request #7998 from doublerr/rackspace_fixes ... Rackspace fixes	2015-05-19 09:59:54 -07:00
Whit Morriss	5d19597ffa	Add juju action to start petstore example ... This is @chuckbutler's work, with some small fixes `juju action do kubernetes-master/0 petstore` launches the example code	2015-05-19 09:47:08 -05:00
Brendan Burns	f51f8b3a86	More fixes for release 0.17.0	2015-05-18 20:47:03 -07:00
Brendan Burns	cbef26b1dd	Update docker instructions to 0.17.0	2015-05-18 16:51:48 -07:00
Christoph Hartmann	7f6fa21171	update kubectl urls	2015-05-18 22:44:51 +02:00
Victor Marmol	48d20980e2	Merge pull request #8409 from AntonioMeireles/setup-network-environment_newHome ... update setup-network-environment 's download URL.	2015-05-18 11:22:24 -07:00
Victor Marmol	4ba22e713a	Merge pull request #8296 from jlowdermilk/gen-analytics ... Add ga-beacon analytics to gendocs scripts	2015-05-18 08:40:02 -07:00
Victor Marmol	dc587b7ab0	Merge pull request #8393 from bmorton/fix-coreos-standalone ... Remove unmatched double-quotes in CoreOS's standalone.yaml	2015-05-18 08:36:07 -07:00
Derek Carr	4753021167	Merge pull request #7617 from pronix/add_libvirt_vagrant_provider ... Add libvirt provider for vagrant	2015-05-18 08:27:51 -04:00
António Meireles	d4258489ff	update setup-network-environment 's download URL. ... handles GoogleCloudPlatform/kubernetes#8405 Signed-off-by: António Meireles <antonio.meireles@reformi.st>	2015-05-18 11:51:06 +01:00
Brian Morton	4d6786a36d	Remove unmatched double-quotes in CoreOS's standalone.yaml.	2015-05-16 23:46:08 -07:00
Jeff Lowdermilk	553f9f822b	Add ga-beacon analytics to gendocs scripts ... hack/run-gendocs.sh puts ga-beacon analytics link into all md files, hack/verify-gendocs.sh verifies presence of link.	2015-05-15 18:56:38 -07:00
Ilya Yakovlev	5f992a4980	Update standalone.yaml	2015-05-15 12:09:13 +03:00
Antoine Cotten	4f1fe55a9e	refresh aws getting-started pages and templates	2015-05-14 23:00:36 +02:00
dima	3519e83001	Add libvirt provider for vagrant ... typo. thanks @fodoj add short desc and link to docs	2015-05-14 10:37:49 +02:00
Ryan Richard	0205c27c50	update rackspace README	2015-05-13 21:33:26 -05:00
Rohit Jnagal	a1ef8585da	Merge pull request #8168 from brendandburns/docker ... Update single node docker to 0.16.2	2015-05-13 13:25:27 -07:00
Rohit Jnagal	be71186c7b	Merge pull request #8152 from BenTheElder/ubuntu_docs_git_clone_fix ... Fix https://github.com/GoogleCloudPlatform/kubernetes/issues/8147	2015-05-13 13:22:38 -07:00
Brendan Burns	48d7604f4e	Update single node docker to 0.16.2	2015-05-13 11:15:56 +01:00
Jeff Lowdermilk	a64cdb34c5	getting-started gce-guide tells users to use downloaded kubectl	2015-05-12 18:21:11 -07:00
BenTheElder	4ecb0193f2	Fixes https://github.com/GoogleCloudPlatform/kubernetes/issues/8147	2015-05-12 20:25:38 -04:00
Nikhil Jindal	671cdc882f	Merge pull request #8015 from guoshimin/master ... Fixing master.yaml: Replacing <master-private-up> with $private_ipv4.	2015-05-11 10:12:33 -07:00
Kenjiro Nakayama	cb2c62f0d8	Fix filepath to simple sample pod	2015-05-11 00:21:33 +09:00
Shimin Guo	539b3523ee	Fixing master.yaml: Replacing <master-private-up> with $private_ipv4.	2015-05-09 00:07:26 -04:00
Victor Marmol	92bd8577e0	Merge pull request #7931 from pmorie/typo ... Fix typos in different config comments	2015-05-08 08:05:51 -07:00
Paul Morie	b5dd5be123	Fix typos in different config comments	2015-05-07 18:44:24 -04:00
Matt Bogosian	89a5c4d44e	Fix environment variable error in Vagrant docs: KUBERNETES_MASTER_MINION -> KUBERNETES_MINION_MEMORY.	2015-05-07 12:04:31 -07:00
Brendan Burns	6ecce081aa	Merge pull request #7887 from elsonrodriguez/coreos-example-update ... Fixes #7886 - Used network-environment to get ip, swap wget for curl	2015-05-07 09:55:51 -07:00
Rohit Jnagal	36bb479c52	Merge pull request #5498 from ZJU-SEL/refactor-ubuntu ... Ubuntu-distro: deprecate & merge ubuntu single node work to ubuntu cluster node stuff	2015-05-07 09:41:20 -07:00
wizard	595345c6a6	Merge the old single-node and multi-node ubuntu deployment into one better approach and update the guidance	2015-05-07 21:01:29 +08:00
Elson Rodriguez	e48bc9ae16	Fixes #7886 - Used network-environment to get ip, swap wget for curl ... I re-used setup-network-environment instead of $private_ipv4, this does meant overwriting the docker.service with a custom service. Also, the wget command was always getting kube-register, curl works more reliabily for this.	2015-05-07 00:11:55 -07:00
Antoine Cotten	31a513d778	update AWS CloudFormation template and cloud-configs ... Kubernetes 0.16.1 and CoreOS 668.2.0 (alpha) a lot of cleanup	2015-05-05 08:26:16 +02:00
Brian Grant	52d388a487	Merge pull request #7649 from brendandburns/example ... Add a central simple getting started guide with kubernetes guide.	2015-05-04 14:46:28 -07:00
Alex Robinson	9927a85cdc	Merge pull request #7522 from simon3z/ovirt-guide ... cloudproviders: add ovirt getting started guide	2015-05-04 10:53:46 -07:00
Avesh Agarwal	2138ab3b84	A guide to set up kubernetes multiple nodes cluster with flannel on fedora.	2015-05-04 12:38:28 -04:00
Brendan Burns	37eedef348	Add a central simple getting started guide with kubernetes guide. ... Point several getting started guides at this doc.	2015-05-01 20:20:15 -07:00
Andy Lindeman	ba83a511f2	Removes spurious quotation mark	2015-05-01 17:38:33 -04:00
António Meireles	adf8704f4c	docs/getting-started-guides/coreos/: update for 0.15.0+ support. ... - allow payloads to run in privileged mode. - update kube-register to latest upstream (v0.0.3). - jump into the etcd2 bandwagon. - etcd master on master node. - etcd proxies in nodes. - update docs to reflect minimum required CoreOS version. - 653.0.0 is the first to ship with etcd2, which we now consume. - propagate changes on coreos/cloud-configs/ also to aws/cloud-configs/. - update tested k8s versions that this addresses in the getting-started-guides table ence making sure we are consistent across it regarding the versions we claim to have tested, add myself there as contact too. - do not assume that cloud-init shortcuts will get everything right. - they won't (as setup-network-environment who populates *_ipv4, etc only runs way later). - use flannel's plain defaults, as they should just be enough for the common case. Signed-off-by: António Meireles <antonio.meireles@reformi.st>	2015-05-01 17:54:44 +01:00
Eric Tune	dddf414cf5	Merge pull request #7195 from mbruzek/add-charms ... Add the Juju charms to Kubernetes	2015-04-30 16:26:58 -07:00
CJ Cullen	a529c0e0f3	Merge pull request #7499 from elsonrodriguez/coreos-example-fix ... Fixes #7498 - CoreOS Getting Started Guide had invalid cloud config	2015-04-29 10:07:49 -07:00
Harry Zhang	7c043b7b26	Fix invalid character '"' after object key:value pair ... There missed a comma and lead invalid character '"' after object key:value pair	2015-04-29 17:04:37 +08:00