Andreas Kruger bf29198efd Fix merge conflict

2018-03-29 09:11:13 +02:00

..

defaults

Change single Vault pki mount to multi pki mounts paths for etcd and kube CA`s (#1552)

2017-08-30 16:03:22 +03:00

files

change expirations period for generated certificate from 10 years to 100 years

2018-03-14 13:33:36 +03:00

handlers

Clear admin kubeconfig when rotating certs (#1772)

2017-10-12 09:55:46 +01:00

meta

Vault security hardening and role isolation

2017-02-08 21:41:36 +00:00

tasks

Only copy tokens if tokens_list contains any

2018-03-18 08:42:38 +01:00

templates

Fix merge conflict

2018-03-29 09:11:13 +02:00