Commit Graph

7 Commits (223c167d66346807c133acfbfb9c8a635703c9a2)

Author SHA1 Message Date
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
Mike Danese c676f8dabb remove unused static-routes from salt 2016-03-21 17:38:08 -07:00
Robert Bailey d5bb12134e Replace monit with supervisord in documentation. 2015-11-03 16:20:02 -08:00
Mike Danese 8e8437dad8 declare azure/ubuntu/saltstack bankruptcy 2015-10-16 18:21:21 -07:00
Eric Tune 682abd9dab Scratch Getting-started-guide 2015-07-06 10:38:20 -07:00
Jeff Lowdermilk 553f9f822b Add ga-beacon analytics to gendocs scripts
hack/run-gendocs.sh puts ga-beacon analytics link into all md files,
hack/verify-gendocs.sh verifies presence of link.
2015-05-15 18:56:38 -07:00
Zach Loafman c292d2e8d6 Update the existing salt.md, add the start of a Salt README tree
Starts to fix #6070
2015-04-06 14:41:21 -07:00