johndmulhausen cef1accd9d Merge branch 'master' into release-1.3 ...

# Conflicts:
#	docs/admin/resourcequota/index.md
#	docs/admin/resourcequota/object-counts.yaml
#	docs/admin/resourcequota/walkthrough.md
#	docs/user-guide/downward-api/index.md

2016-07-07 02:00:32 -07:00

..

globals.yml

Moving docs from /vX to /docs; we will use branches for old versions.

2016-02-29 15:17:22 -08:00

guides.yml

Merge branch 'master' into release-1.3

2016-07-07 02:00:32 -07:00

overrides.yml

Refdocs for 1.2 import

2016-03-07 16:51:25 +00:00

reference.yml

Fix title

2016-06-28 13:23:30 -07:00

samples.yml

fixit-575: typo in link to k8petstore

2016-06-29 15:12:16 +02:00

support.yml

Refactor of template demo instructions

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