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

..

federation

Update details now that we try to make a PV for etcd.

2016-06-30 13:45:13 -07:00

high-availability

Consistent use of quoting

2016-05-19 13:43:43 +02:00

limitrange

rebase

2016-03-29 17:11:32 -07:00

multiple-schedulers

Multi-scheduler documentation with examples.

2016-04-15 10:39:34 -07:00

namespaces

Typo in /admin/namespaces

2016-05-29 13:53:21 +02:00

resourcequota

Merge branch 'master' into release-1.3

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

accessing-the-api.md

edits to accessing-the-api.md to correct formatting and other minor issues

2016-04-11 16:59:50 -05:00

admission-controllers.md

Remove SecurityContextDeny from 1.2 admission-control recommendation

2016-05-18 16:08:29 -07:00

authentication.md

edits to authentication.md to correct formatting

2016-04-04 13:52:01 -05:00

authorization.md

Merge branch 'master' into release-1.3

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

cluster-components.md

Fixed links in cluster-components

2016-05-26 14:17:40 +01:00

cluster-large.md

Update Heapster K8s doc

2016-03-15 15:59:08 +01:00

cluster-management.md

Cluster autoscaler doc - part 1

2016-06-20 15:54:36 +02:00

cluster-troubleshooting.md

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

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

daemon.yaml

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

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

daemons.md

Once -> One

2016-03-18 09:16:54 +08:00

dns.md

Deprecate the term "Ubernetes" in documentation.

2016-07-06 14:14:25 -07:00

etcd.md

1.2 changes for admin/

2016-03-06 04:26:30 -08:00

garbage-collection.md

1.2 additions for getting-started-guides/ and new non-Markdown files for user-guides

2016-03-06 17:55:12 +00:00

index.md

Surfaces previously hidden topics that had URL conflicts, moves pages to index.md as often as possible

2016-03-29 14:58:48 -07:00

kube-apiserver.md

Fixes for refdocs

2016-03-17 17:08:15 -07:00

kube-controller-manager.md

Fixes for refdocs

2016-03-17 17:08:15 -07:00

kube-proxy.md

Fixes for refdocs

2016-03-17 17:08:15 -07:00

kube-scheduler.md

Fixes for refdocs

2016-03-17 17:08:15 -07:00

kubelet.md

Fixes for refdocs

2016-03-17 17:08:15 -07:00

master-node-communication.md

1.2 changes for admin/

2016-03-06 04:26:30 -08:00

multi-cluster.md

Adding a doc with instructions to setup federation

2016-06-29 16:11:04 -07:00

multiple-schedulers.md

Multi-scheduler documentation with examples.

2016-04-15 10:39:34 -07:00

multiple-zones.md

Deprecate the term "Ubernetes" in documentation.

2016-07-06 14:14:25 -07:00

network-plugins.md

explain network-plugin-dir in case of kubenet

2016-06-29 11:42:56 -07:00

networking.md

Merge pull request #326 from jainvipin/master

2016-05-22 20:30:16 -07:00

node-problem.md

Add document for node problem detector.

2016-06-24 16:00:32 -07:00

node.md

remove trailing commas from JSON

2016-03-14 20:11:30 +03:00

out-of-resource.md

Out of resource handling for 1.3

2016-07-05 14:27:26 -04:00

ovs-networking.md

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

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

salt.md

1.2 changes for admin/

2016-03-06 04:26:30 -08:00

service-accounts-admin.md

1.2 changes for admin/

2016-03-06 04:26:30 -08:00

static-pods.md

1.2 changes for admin/

2016-03-06 04:26:30 -08:00