Merge pull request #1 from kubespray/master

roles/network_plugin/calico/templates/network-environment.j2

roles/network_plugin/flannel/handlers/main.yml

roles/network_plugin/flannel/meta/main.yml

roles/network_plugin/flannel/tasks/main.yml

roles/network_plugin/flannel/templates/docker-systemd

roles/network_plugin/flannel/templates/flannel-pod.yml

...s/network_plugin/flannel/templates/systemd-docker.service

roles/network_plugin/weave/handlers/main.yml

roles/network_plugin/weave/tasks/main.yml

roles/network_plugin/weave/templates/systemd-docker.service

roles/network_plugin/weave/templates/weave.service.j2

roles/network_plugin/weave/templates/weaveexpose.service.j2

roles/network_plugin/weave/templates/weaveproxy.service.j2

roles/uploads/defaults/main.yml

roles/uploads/tasks/main.yml

roles/uploads/vars/kube_versions.yml

scripts/collect-info.yaml

scripts/configure-logs.yaml

tests/ansible.cfg

ubuntu-bootstrap.yml