Commit Graph

308 Commits (683c288bcc9f5cf2ea769fd5339a1028cbdd7d20)

Author SHA1 Message Date
Tarun Chinmai 567374824e Merge branch 'master' into patch-2 2016-09-27 22:38:57 +05:30
Tarun Chinmai f1ef1e3b81 Merge branch 'master' into patch-1 2016-09-27 22:38:06 +05:30
steveperry-53 8727ac746c Remove copyright notice from bootcamp pages. 2016-09-27 08:49:46 -07:00
Tarun Chinmai 2a092c6395 Removed line 19. was junk 2016-09-27 16:48:39 +05:30
Tarun Chinmai 5e92903656 fixed wrong command
there's no such command as kubectl display. changed to kubectl describe.
2016-09-27 16:47:29 +05:30
steveperry-53 926ec86e60 Merge branch 'master' of https://github.com/kubernetes/kubernetes.github.io 2016-09-26 16:20:27 -07:00
steveperry-53 822d59b5e4 Write page templates and canonical examples.
Conflicts:
	_data/tasks.yml
	_data/tutorials.yml
	docs/tasks/access-kubernetes-api/http-proxy-access-api.md
	docs/tasks/index.md
	docs/tutorials/index.md
2016-09-26 08:06:06 -07:00
steveperry-53 cbb82d292b Integrate bootcamp into Kubernetes docs. 2016-09-10 23:00:44 -07:00