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

..

best-effort.yaml

Improve and update ResourceQuota example

2016-06-27 14:31:17 -04:00

compute-resources.yaml

Improve and update ResourceQuota example

2016-06-27 14:31:17 -04:00

index.md

Improve and update ResourceQuota example

2016-06-27 14:31:17 -04:00

limits.yaml

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

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

namespace.yaml

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

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

not-best-effort.yaml

Improve and update ResourceQuota example

2016-06-27 14:31:17 -04:00

object-counts.yaml

Merge branch 'master' into release-1.3

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

walkthrough.md

Merge branch 'master' into release-1.3

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