Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

K

Kubespray
- Activity
- Members
- Model registry

Snippets Groups Projects

36fc05d2

Commit 36fc05d2 authored 8 years ago by Pablo Moreno Committed by GitHub 8 years ago

Downloads
- Plain Diff

Merge pull request #2 from kubernetes-incubator/master

stays up to date with upstream repo

parents a3f892c7 7abc747b

No related branches found

No related tags found

No related merge requests found

Changes 9

Show whitespace changes

Inline Side-by-side

Showing

.travis.yml 24 additions, 10 deletions

.travis.yml
OWNERS 3 additions, 0 deletions

OWNERS
roles/dnsmasq/defaults/main.yml 7 additions, 1 deletion

roles/dnsmasq/defaults/main.yml
roles/dnsmasq/tasks/main.yml 1 addition, 1 deletion

roles/dnsmasq/tasks/main.yml
roles/kubernetes/secrets/tasks/gen_certs.yml 15 additions, 16 deletions

roles/kubernetes/secrets/tasks/gen_certs.yml
roles/kubernetes/secrets/tasks/gen_tokens.yml 6 additions, 11 deletions

roles/kubernetes/secrets/tasks/gen_tokens.yml
tests/cloud_playbooks/create-gce.yml 1 addition, 1 deletion

tests/cloud_playbooks/create-gce.yml
tests/cloud_playbooks/delete-gce.yml 1 addition, 1 deletion

tests/cloud_playbooks/delete-gce.yml
tests/templates/inventory-gce.j2 11 additions, 0 deletions

tests/templates/inventory-gce.j2

with 69 additions and 41 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