Merge branch 'master' into local_volume_provisioner

README.md

docs/cloud.md

docs/coreos.md

docs/getting-started.md

inventory/group_vars/k8s-cluster.yml

roles/kubernetes-apps/meta/main.yml

roles/kubernetes-apps/registry/README.md

roles/kubernetes-apps/registry/defaults/main.yml

roles/kubernetes-apps/registry/files/images/Dockerfile

roles/kubernetes-apps/registry/files/images/Makefile

roles/kubernetes-apps/registry/files/images/rootfs/bin/boot

...stry/files/images/rootfs/etc/nginx/conf.d/default.conf.in

...gistry/files/images/rootfs/etc/nginx/docker-registry.conf

...es-apps/registry/files/images/rootfs/etc/nginx/nginx.conf

roles/kubernetes-apps/registry/tasks/main.yml

roles/kubernetes-apps/registry/templates/auth/README.md

...etes-apps/registry/templates/auth/registry-auth-rc.yml.j2

roles/kubernetes-apps/registry/templates/gcs/README.md

...rnetes-apps/registry/templates/gcs/registry-gcs-rc.yml.j2

roles/kubernetes-apps/registry/templates/registry-ds.yml.j2