Raj Perera 992a974b1e Merge branch 'rbac-kp' into rbac-script-cert ... # Conflicts: # roles/kubernetes-apps/ansible/tasks/main.yml # roles/kubernetes-apps/ansible/templates/kubedns-deploy.yml # roles/kubernetes-apps/ansible/templates/kubedns-sa.yml # roles/kubernetes/node/templates/manifests/kube-proxy.manifest.j2 # roles/kubernetes/secrets/files/make-ssl.sh		2017-06-16 11:11:12 -04:00
..
master	Merge branch 'rbac-kp' into rbac-script-cert	2017-06-16 11:11:12 -04:00
node	Merge branch 'rbac-kp' into rbac-script-cert	2017-06-16 11:11:12 -04:00
preinstall	Ansible 2.3 support	2017-04-26 15:22:10 +02:00
secrets	Merge branch 'rbac-kp' into rbac-script-cert	2017-06-16 11:11:12 -04:00