Andreas Kruger bf29198efd Fix merge conflict

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

..

adduser

…

bastion-ssh-config

change ssh_args/bastion configuration (#1883)

2017-10-27 12:18:39 +01:00

bootstrap-os

baremetal tweaks

2018-02-06 13:52:22 -05:00

dnsmasq

Fix default_resolver is undefined

2018-02-10 10:08:26 -06:00

docker

Remove old docker packages and other docker upgrade fixes (#2536)

2018-03-28 15:10:39 -05:00

download

Merge pull request #2262 from tmjd/calico-canal-v2-6-7

2018-03-27 21:07:28 -05:00

etcd

Update openssl.conf to count better and work with Jinja 2.9

2018-03-28 17:48:56 +02:00

kubernetes

Fix merge conflict

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

kubernetes-apps

Merge pull request #2488 from LuckySB/ingress-nginx-node-role

2018-03-28 14:07:40 +02:00

kubespray-defaults

Merge pull request #2498 from zmsp/master

2018-03-21 20:25:05 -05:00

network_plugin

Fixup for #2523:

2018-03-28 11:16:42 +08:00

remove-node

Remove nodes

2018-03-08 15:03:42 +08:00

reset

clean http-proxy.conf

2018-03-08 23:16:02 +08:00

rkt

Use include/import tasks (#2192)

2018-01-29 14:37:48 +03:00

upgrade

Making status and detection mo betta

2018-02-09 12:30:46 -06:00

vault

Addition of the .creds extension to the credentials files generated by password lookup in order for Ansible not to consider them as inventory files with inventory_ignore_extensions set accordingly (#2446)

2018-03-21 10:50:32 +03:00