steveperry-53 05dbc740e1 Merge branch 'master' into bcamp ...

Conflicts:
	_layouts/docwithnav.html

2016-09-18 19:21:59 -07:00

..

globals.yml

Integrate bootcamp into Kubernetes docs.

2016-09-10 23:00:44 -07:00

guides.yml

Add link to IBM SoftLayer instructions

2016-09-10 10:50:25 -04:00

overrides.yml

Update docs release script

2016-08-12 14:37:25 -07:00

reference.yml

Alphabetized Lists

2016-08-05 14:37:04 -07:00

samples.yml

Fix bad sample link.

2016-08-09 13:05:30 -07:00

support.yml

Refactor of template demo instructions

2016-06-26 00:17:59 -07:00

tutorials.yml

Integrate bootcamp into Kubernetes docs.

2016-09-10 23:00:44 -07:00