Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

K

Kubespray
- Activity
- Members
- Model registry

Snippets Groups Projects

8092f576

Commit 8092f576 authored 8 years ago by Matthew Mosesohn Committed by GitHub 8 years ago

Downloads
- Plain Diff

Merge branch 'master' into calico-cni-container-support

parents 965a1234 bb72de0d

No related branches found

No related tags found

No related merge requests found

Changes 4

Show whitespace changes

Inline Side-by-side

Showing

contrib/terraform/terraform.py 1 addition, 0 deletions

contrib/terraform/terraform.py
roles/dnsmasq/tasks/resolvconf.yml 1 addition, 0 deletions

roles/dnsmasq/tasks/resolvconf.yml
roles/kubernetes/node/templates/kubelet.j2 1 addition, 1 deletion

roles/kubernetes/node/templates/kubelet.j2
roles/kubernetes/preinstall/tasks/etchosts.yml 1 addition, 1 deletion

roles/kubernetes/preinstall/tasks/etchosts.yml

with 4 additions and 2 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment