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
..
ansible	Merge branch 'rbac-kp' into rbac-script-cert	2017-06-16 11:11:12 -04:00
efk	Fixing resource type for kibana	2017-04-10 11:01:12 -05:00
helm	Basic RBAC functionality. (Based from work done by @jwfang (#1351))	2017-06-16 10:28:23 -04:00
kpm	Rework inventory all by real groups' vars	2017-02-23 09:43:42 +01:00
meta	Merge pull request #1155 from mattymo/helm	2017-03-20 17:00:06 +03:00
network_plugin	Fix weave on RHEL deployment	2017-03-17 18:17:47 +03:00
policy_controller	Move calico-policy-controller into separate role	2017-03-17 11:21:52 +01:00