Andrew Chen 4eba51d6f2 Merge branch 'master' of https://github.com/kubernetes/kubernetes.github.io into release-1.6 ...

* 'master' of https://github.com/kubernetes/kubernetes.github.io:
  Fix incorrect sentence (#2876)
  fixing typo
  fix typo
  Update kubeadm.md

# Conflicts:
#	docs/getting-started-guides/kubeadm.md

2017-03-21 19:30:14 -07:00

..

configmap

Move init containers to stable in v1.6 (#1939)

2017-03-21 18:13:33 -07:00

downward-api

Add note about moved content. (#2563)

2017-02-16 13:20:48 -08:00

environment-guide

Move Guide topic: Using Environment Variables. (#2645)

2017-02-28 19:05:31 -08:00

federation

Move Guide topic: Federation Service Discovery. (#2884)

2017-03-16 16:27:55 -07:00

horizontal-pod-autoscaling

Merge pull request #2720 from DirectXMan12/feature/hpa-v2

2017-03-20 15:10:54 -07:00

jobs

Rename /docs/tasks/job/work-queue-1/

2017-03-16 12:56:44 -07:00

kubectl

Move init containers to stable in v1.6 (#1939)

2017-03-21 18:13:33 -07:00

liveness

Write new Task: Configuring Liveness and Readiness Probes

2017-01-04 15:41:25 -08:00

logging

Move Guide topics: Logging (#2687)

2017-03-03 11:21:01 -08:00

nginx

…

node-selection

Merge branches 'release-1.6' and 'master' of https://github.com/kubernetes/kubernetes.github.io into release-1.6

2017-03-21 19:04:37 -07:00

persistent-volumes

Merge branch 'master' of https://github.com/kubernetes/kubernetes.github.io into release-1.6

2017-03-21 15:54:35 -07:00

petset

Move Guide topic: Bootstrapping Pet Sets. (#2662)

2017-03-01 09:20:52 -08:00

pod-security-policy

Move init containers to stable in v1.6 (#1939)

2017-03-21 18:13:33 -07:00

pods

Move Guide topics: Container Lifestyle Hooks, Images, Volumes

2017-03-20 15:35:51 -07:00

projected-volume

Add docs for projected volume driver

2017-03-03 09:23:47 -08:00

replicasets

…

replication-controller

Move Guide topic: Parallel Processing using Expansions (#2867)

2017-03-16 11:31:57 -07:00

secrets

Move Guide topics: Container Lifestyle Hooks, Images, Volumes

2017-03-20 15:35:51 -07:00

services

Move Guide topic: Service. (#2891)

2017-03-17 09:59:35 -07:00

update-demo

Move Guide topic: Rolling Update Demo (#2850)

2017-03-15 17:31:38 -07:00

walkthrough

Move Guide topics: Container Lifestyle Hooks, Images, Volumes

2017-03-20 15:35:51 -07:00

accessing-the-cluster.md

Fix incorrect sentence (#2876)

2017-03-21 19:20:57 -07:00

annotations.md

add explicit titles to docs

2016-12-15 15:16:54 -05:00

application-troubleshooting.md

add explicit titles to docs

2016-12-15 15:16:54 -05:00

bad-nginx-deployment.yaml

…

compute-resources.md

Move Compute Resources topic to Concepts. (#2410)

2017-02-27 14:16:14 -08:00

config-best-practices.md

Move Guide topic: Configuration Best Practices

2017-03-15 17:41:59 -07:00

connecting-applications.md

Move Guide topic: Connecting Apps with Services. (#2885)

2017-03-16 16:50:19 -07:00

connecting-to-applications-port-forward.md

Move Guide topic: Using Port Forwarding. (#2661)

2017-03-01 08:55:15 -08:00

connecting-to-applications-proxy.md

Move Guide topic: Connect with Proxies. (#2663)

2017-03-01 09:42:05 -08:00

container-environment.md

Move Guide topics: Container Lifestyle Hooks, Images, Volumes

2017-03-20 15:35:51 -07:00

cron-jobs.md

Merge remote-tracking branch 'upstream/master' into release-1.6

2017-03-20 13:51:51 -07:00

cronjob.yaml

…

curlpod.yaml

…

debugging-pods-and-replication-controllers.md

add explicit titles to docs

2016-12-15 15:16:54 -05:00

debugging-services.md

Update debugging-services.md

2017-02-08 10:54:50 -08:00

deployment.yaml

…

deployments.md

Merge branch 'master' of https://github.com/kubernetes/kubernetes.github.io into release-1.6

2017-03-21 15:54:35 -07:00

docker-cli-to-kubectl.md

Move Guide topics: Container Lifestyle Hooks, Images, Volumes

2017-03-20 15:35:51 -07:00

garbage-collection.md

Move Guide topic: Garbage Collection. (#2488)

2017-02-21 19:12:47 -08:00

getting-into-containers.md

Move Guide toic to Tasks: kubectl exec.

2017-02-15 18:06:07 -08:00

identifiers.md

add explicit titles to docs

2016-12-15 15:16:54 -05:00

images.md

Move Guide topics: Container Lifestyle Hooks, Images, Volumes

2017-03-20 15:35:51 -07:00

index.md

Move Guide topics: Container Lifestyle Hooks, Images, Volumes

2017-03-20 15:35:51 -07:00

ingress.md

Fix broken/outdated links in the ingress.md file

2017-02-14 13:21:47 -08:00

ingress.yaml

…

introspection-and-debugging.md

fix typo

2017-03-21 19:12:09 -07:00

job.yaml

…

jobs.md

Merge branch 'release-1.6' of https://github.com/kubernetes/kubernetes.github.io into release-1.6

2017-03-20 13:53:52 -07:00

jsonpath.md

Improve grammar

2017-02-13 10:13:55 -08:00

kubeconfig-file.md

Move Guide topic: Kubeconfig File

2017-03-16 15:42:11 -07:00

kubectl-cheatsheet.md

Move Guide topic: Kubeconfig File

2017-03-16 15:42:11 -07:00

kubectl-conventions.md

Merge remote-tracking branch 'upstream/master' into release-1.6

2017-03-20 13:51:51 -07:00

kubectl-overview.md

Move Guide topic: Prereqs

2017-03-16 14:53:31 -07:00

load-balancer.md

Move Guide topic: Service. (#2891)

2017-03-17 09:59:35 -07:00

managing-deployments.md

fix link

2017-03-15 15:38:56 -07:00

monitoring.md

Move Guide topic: Resource Monitoring. (#2895)

2017-03-17 10:35:08 -07:00

multi-pod.yaml

…

namespaces.md

Move init containers to stable in v1.6 (#1939)

2017-03-21 18:13:33 -07:00

networkpolicies.md

add explicit titles to docs

2016-12-15 15:16:54 -05:00

new-nginx-deployment.yaml

…

nginx-app.yaml

…

nginx-deployment.yaml

…

nginx-init-containers.yaml

Move init containers to stable in v1.6 (#1939)

2017-03-21 18:13:33 -07:00

nginx-lifecycle-deployment.yaml

…

nginx-probe-deployment.yaml

…

nginx-secure-app.yaml

…

nginx-svc.yaml

…

OWNERS

…

petset.md

Move Guide topics: Container Lifestyle Hooks, Images, Volumes

2017-03-20 15:35:51 -07:00

petset.yaml

Add deprecation warning on PetSet guide.

2016-12-06 15:11:25 -08:00

pod-states.md

Move Pod Lifecycle to Concepts. (#2420)

2017-02-15 14:56:39 -08:00

pod-templates.md

Move Guide topic: Pod Templates (#2872)

2017-03-16 13:34:57 -07:00

pod-w-message.yaml

…

pod.yaml

…

prereqs.md

Move Guide topic: Prereqs

2017-03-16 14:53:31 -07:00

redis-deployment.yaml

…

redis-resource-deployment.yaml

…

redis-secret-deployment.yaml

…

replicasets.md

s/acomplish/accomplish/

2017-03-03 00:15:59 -08:00

resizing-a-replication-controller.md

Move Guide topic: Resizing a replication controller

2017-03-15 16:17:09 -07:00

rolling-updates.md

Move Guide topic: Rolling Updates

2017-03-15 16:53:37 -07:00

run-my-nginx.yaml

…

security-context.md

Update security-context.md

2017-01-11 16:59:03 +08:00

service-accounts.md

Move Guide topics: Container Lifestyle Hooks, Images, Volumes

2017-03-20 15:35:51 -07:00

services-firewalls.md

Move Guide topic: Config Provider Firewalls. (#2883)

2017-03-16 16:06:59 -07:00

sharing-clusters.md

Move Guide topic: Sharing Clusters

2017-03-16 15:15:28 -07:00

simple-yaml.md

…

thirdpartyresources.md

Add link to feature issue for TPR

2017-01-24 13:46:13 -05:00

ui.md

Move Guide topics: Container Lifestyle Hooks, Images, Volumes

2017-03-20 15:35:51 -07:00

volumes.md

Move Guide topics: Container Lifestyle Hooks, Images, Volumes

2017-03-20 15:35:51 -07:00

working-with-resources.md

Remove Guide topic: kubectl to Manage Resources.

2017-02-08 16:59:28 -08:00