14 Commits

Author	SHA1	Message	Date
Benedikt Werner	6900e6ece1	Merge branch 'develop' into accept-minions-from-grains	2017-11-17 19:35:53 +01:00
Erik Johnson	df972db3ba	Merge pull request #42930 from CorvinM/issue36942 ... Jinja line statements and comments	2017-11-13 12:02:16 -08:00
Benedikt Werner	d568c73c76	Prepend root dir config to autosign_grains_dir	2017-10-29 13:53:55 +01:00
Benedikt Werner	fbe4fa81d5	Added docs for autoaccepting grains	2017-10-29 13:53:49 +01:00
Benedikt Werner	53dd162729	Fixed grammar	2017-10-21 00:55:58 +02:00
Benedikt Werner	295b5d4834	Added tests and doc	2017-10-20 06:02:08 +02:00
Ronald van Zantvoort	e555b6351b	doc fixes for salt-ssh roster(s) opts	2017-10-12 11:42:23 +02:00
Corvin Mcpherson	c67db52c73	Merge branch 'develop' into issue36942	2017-10-01 18:56:58 -04:00
Corvin Mcpherson	19dcfcf1a0	Add jinja_env and jinja_sls_env master configuration options documentation	2017-10-01 14:36:15 -04:00
Ronald van Zantvoort	bfbca748e2	highstate output: Document additional output modes	2017-09-25 18:32:52 +02:00
Corvin Mcpherson	2dc593b48e	Add jinja environment default options.	2017-08-16 20:02:13 -04:00
Corvin Mcpherson	23e1b23925	Change jinja line statement and line comment prefix default to '' instead of None	2017-08-15 02:13:43 -04:00
Corvin Mcpherson	eb713c699f	Add jinja line statement and line comment options to master config.	2017-08-14 19:56:34 -04:00
Klaus Kämpf	0cf36b487b	Run salt master as dedicated salt user ... * Minion runs always as a root	2017-06-20 17:13:00 +01:00