Weixu Zhuang 4523429b20 Azure/ubuntu/saltstack support re-instated ... This first reverts commit 8e8437dad8. Also resolves conflicts with docs on f334fc41 And resolves conflicts with https://github.com/kubernetes/kubernetes/pull/22231/commits to make people switching between two different methods of setting up by setting env variables. Conflicts: cluster/get-kube.sh cluster/saltbase/salt/README.md cluster/saltbase/salt/kube-proxy/default cluster/saltbase/salt/top.sls		2016-06-17 23:41:41 -07:00
..
client.conf	Azure/ubuntu/saltstack support re-instated	2016-06-17 23:41:41 -07:00
init.sls	Azure/ubuntu/saltstack support re-instated	2016-06-17 23:41:41 -07:00