Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

K

Kubespray
- Activity
- Members
- Model registry

Snippets Groups Projects

bf29198e

Commit bf29198e authored 7 years ago by Andreas Kruger

Downloads
- Plain Diff

Fix merge conflict

parents 0b5404b2 db4e2253

No related branches found

No related tags found

No related merge requests found

Changes 5

Show whitespace changes

Inline Side-by-side

Showing

roles/docker/defaults/main.yml 4 additions, 0 deletions

roles/docker/defaults/main.yml
roles/docker/tasks/main.yml 18 additions, 0 deletions

roles/docker/tasks/main.yml
roles/docker/tasks/pre-upgrade.yml 20 additions, 0 deletions

roles/docker/tasks/pre-upgrade.yml
roles/docker/vars/redhat.yml 2 additions, 0 deletions

roles/docker/vars/redhat.yml
roles/kubernetes/secrets/templates/openssl.conf.j2 0 additions, 9 deletions

roles/kubernetes/secrets/templates/openssl.conf.j2

with 44 additions and 9 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