8 Commits

Author	SHA1	Message	Date
René Jochum	c5ae289fa1	Fix stuff suggested by @iggy. ... Signed-off-by: René Jochum <rene@jochums.at>	2015-07-13 22:31:32 +02:00
René Jochum	90282eff03	Install cherrypy/tornado from pip only if use_pip is True. ... Signed-off-by: René Jochum <rene@jochums.at>	2015-07-13 22:08:20 +02:00
René Jochum	8a1b8dc9db	Fix salt/api.sls. ... Signed-off-by: René Jochum <rene@jochums.at>	2015-07-13 13:46:17 +02:00
René Jochum	7bb82b0178	Advance sal/api.sls, install rest_cherrypy or rest_tornado from pip. ... Signed-off-by: René Jochum <rene@jochums.at>	2015-07-13 13:37:10 +02:00
Niels Abspoel	9ae8a4d746	Fix recursion in api.service	2015-03-28 22:29:01 +01:00
Brian Jackson	924c04c0d8	Add setting to not install packages ... If you are installing Salt via git/pip, the formula will try to overwrite your install with packaged versions. This setting makes it possible to avoid that.	2015-03-24 12:08:08 -05:00
Brian Jackson	cb3aa80c62	Don't overwrite salt variable ... Using a variable named salt is a bad idea when salt already has a variable named salt.	2015-03-16 23:39:32 -05:00
Niels Abspoel	5785091305	Added salt-api support	2015-03-08 00:01:28 +01:00