Tiru Srikantha 
							
						 
					 
					
						
						
						
						
							
						
						
							70b5c981fa 
							
						 
					 
					
						
						
							
							Test if individual gitfs remote is string  
						
						... 
						
						
						
						https://github.com/saltstack-formulas/salt-formula/issues/64 
Fixes issue where a gitfs remote that has no child options would cause an
error. Also fix up bad yaml in pillar example. 
					
						2014-11-12 20:32:43 -08:00 
						 
				 
			
				
					
						
							
							
								Nitin Madhok 
							
						 
					 
					
						
						
						
						
							
						
						
							0f5f976433 
							
						 
					 
					
						
						
							
							Merge pull request  #63  from sinnerschrader/feature/add_yaml_utf8_to_master_config  
						
						... 
						
						
						
						adds `yaml_utf8` option to master config 
						
						
					 
					
						2014-11-09 10:12:37 -05:00 
						 
				 
			
				
					
						
							
							
								Marvin Frick 
							
						 
					 
					
						
						
						
						
							
						
						
							868854c2e7 
							
						 
					 
					
						
						
							
							enables use of jinja < 2.6  
						
						... 
						
						
						
						Commit 2b51a6f0c39b4df56823afe9d114dab886e3359e introduced options for gitfs_remotes in a pillar by using a jinja test to see if a parameter is a mapping (dict etc.). This feature however is only available in jinja 2.6 or newer (see http://jinja.pocoo.org/docs/dev/templates/#mapping ).
Although this version of Jinja is available on Ubuntu, other OS / package managers do provide older versions (2.2.1 in RedHat 6).
This change makes use of the "iterable" test which should do the exact same thing. 
						
						
					 
					
						2014-11-09 13:16:06 +01:00 
						 
				 
			
				
					
						
							
							
								Marvin Frick 
							
						 
					 
					
						
						
						
						
							
						
						
							8a187ac13f 
							
						 
					 
					
						
						
							
							adds yaml_utf8 option to master config  
						
						... 
						
						
						
						Reference about this config value: http://docs.saltstack.com/en/latest/ref/configuration/master.html#yaml-utf8 
Reference why this might be useful: https://github.com/saltstack/salt/issues/3436#issuecomment-61225863  
						
						
					 
					
						2014-11-09 13:02:14 +01:00 
						 
				 
			
				
					
						
							
							
								Tim O'Guin 
							
						 
					 
					
						
						
						
						
							
						
						
							cde16097ed 
							
						 
					 
					
						
						
							
							add support for installing salt-ssh and managing the roster file, updated README and pillar.example  
						
						
						
						
					 
					
						2014-10-28 11:45:32 -05:00 
						 
				 
			
				
					
						
							
							
								Tim O'Guin 
							
						 
					 
					
						
						
						
						
							
						
						
							9fa42fe09d 
							
						 
					 
					
						
						
							
							fixed YAML issue with templated reactor config  
						
						
						
						
					 
					
						2014-10-28 10:55:18 -05:00 
						 
				 
			
				
					
						
							
							
								Tim O'Guin 
							
						 
					 
					
						
						
						
						
							
						
						
							3d52dfd8ec 
							
						 
					 
					
						
						
							
							added proper indentation for jinja conditionals in reactor template  
						
						
						
						
					 
					
						2014-10-24 17:04:12 -05:00 
						 
				 
			
				
					
						
							
							
								Tim O'Guin 
							
						 
					 
					
						
						
						
						
							
						
						
							2852e7b897 
							
						 
					 
					
						
						
							
							add templated file for reactor configuration and update pillar.example.  
						
						
						
						
					 
					
						2014-10-24 14:48:56 -05:00 
						 
				 
			
				
					
						
							
							
								Ajna Cackovic 
							
						 
					 
					
						
						
						
						
							
						
						
							2b51a6f0c3 
							
						 
					 
					
						
						
							
							Allow repo options to be set per repo for gitfs_remotes in pillar  
						
						
						
						
					 
					
						2014-10-23 18:32:47 -07:00 
						 
				 
			
				
					
						
							
							
								Andrew Vant 
							
						 
					 
					
						
						
						
						
							
						
						
							00e245e20a 
							
						 
					 
					
						
						
							
							Added recursive management of minion.d and master.d.  
						
						... 
						
						
						
						This allows users to easily add configuration settings that the formula
doesn't yet provide, without having to modify the existing templates. 
						
						
					 
					
						2014-10-06 11:56:07 -04:00 
						 
				 
			
				
					
						
							
							
								Andrew Vant 
							
						 
					 
					
						
						
						
						
							
						
						
							970da0ef37 
							
						 
					 
					
						
						
							
							Added salt-cloud support for Rackspace OpenStack servers.  
						
						
						
						
					 
					
						2014-10-03 21:23:50 -04:00 
						 
				 
			
				
					
						
							
							
								Johannes 
							
						 
					 
					
						
						
						
						
							
						
						
							791025e065 
							
						 
					 
					
						
						
							
							Avoid config key clashes  
						
						... 
						
						
						
						Fixes  #48  
					
						2014-10-03 09:43:59 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Rodriguez 
							
						 
					 
					
						
						
						
						
							
						
						
							3bdf2789a1 
							
						 
					 
					
						
						
							
							Added rest_cherrypy section  
						
						
						
						
					 
					
						2014-08-22 22:57:21 -05:00 
						 
				 
			
				
					
						
							
							
								Seth House 
							
						 
					 
					
						
						
						
						
							
						
						
							6c0cc53d5c 
							
						 
					 
					
						
						
							
							Merge pull request  #42  from westurner/fix-nested-_roots  
						
						... 
						
						
						
						Fix for nested [file|pillar]_roots in minion tmpl (seeAlso: #37 ) 
						
						
					 
					
						2014-07-23 11:45:29 -06:00 
						 
				 
			
				
					
						
							
							
								Wes Turner 
							
						 
					 
					
						
						
						
						
							
						
						
							bc7ccedf45 
							
						 
					 
					
						
						
							
							Fix nested file,pillar _roots in minion and master templates  
						
						... 
						
						
						
						See #37  "Fixed file_roots config generation with several environment" 
						
						
					 
					
						2014-07-22 03:04:26 -05:00 
						 
				 
			
				
					
						
							
							
								Love Nyberg 
							
						 
					 
					
						
						
						
						
							
						
						
							85ce73a839 
							
						 
					 
					
						
						
							
							Added functionality to state for salt cloud and exampel for EC2 and GCE  
						
						
						
						
					 
					
						2014-07-20 16:59:38 +02:00 
						 
				 
			
				
					
						
							
							
								Shaun Carlson 
							
						 
					 
					
						
						
						
						
							
						
						
							9b730fc0c8 
							
						 
					 
					
						
						
							
							Fixed typo in autoreject_file setting  
						
						... 
						
						
						
						Fixed an apparent typo in the autoreject_file setting (which was listed as autorejecte_file) 
						
						
					 
					
						2014-06-05 14:16:57 -06:00 
						 
				 
			
				
					
						
							
							
								Oleg Tsarev 
							
						 
					 
					
						
						
						
						
							
						
						
							94da2654e2 
							
						 
					 
					
						
						
							
							Fixed file_roots config generation with several environment  
						
						
						
						
					 
					
						2014-05-10 15:21:37 +02:00 
						 
				 
			
				
					
						
							
							
								Chris McNabb 
							
						 
					 
					
						
						
						
						
							
						
						
							028412ee5e 
							
						 
					 
					
						
						
							
							use master when if in master  
						
						
						
						
					 
					
						2014-03-28 15:13:33 -04:00 
						 
				 
			
				
					
						
							
							
								Oleg Tsarev 
							
						 
					 
					
						
						
						
						
							
						
						
							e3b2ebeb06 
							
						 
					 
					
						
						
							
							Actualized master and minion config files templates  
						
						
						
						
					 
					
						2014-02-11 07:04:03 +04:00 
						 
				 
			
				
					
						
							
							
								tiger-seo 
							
						 
					 
					
						
						
						
						
							
						
						
							507f2abc1a 
							
						 
					 
					
						
						
							
							possibility to define Halite configuration for salt-master  
						
						
						
						
					 
					
						2014-01-14 12:30:43 +02:00 
						 
				 
			
				
					
						
							
							
								tiger-seo 
							
						 
					 
					
						
						
						
						
							
						
						
							f4b839a4fb 
							
						 
					 
					
						
						
							
							sync with  https://github.com/saltstack/salt/blob/v0.17.4/conf/master  and minion  
						
						
						
						
					 
					
						2014-01-08 15:29:39 +02:00 
						 
				 
			
				
					
						
							
							
								Kenneth Wilke 
							
						 
					 
					
						
						
						
						
							
						
						
							9404ebf915 
							
						 
					 
					
						
						
							
							Added module_config section to minion template  
						
						
						
						
					 
					
						2013-09-03 09:45:24 -05:00 
						 
				 
			
				
					
						
							
							
								Kenneth Wilke 
							
						 
					 
					
						
						
						
						
							
						
						
							d337cc2784 
							
						 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/saltstack-formulas/salt-formula  
						
						
						
						
					 
					
						2013-08-27 11:14:18 -05:00 
						 
				 
			
				
					
						
							
							
								Kenneth Wilke 
							
						 
					 
					
						
						
						
						
							
						
						
							e3a29bf69a 
							
						 
					 
					
						
						
							
							ext_pillar fix  
						
						
						
						
					 
					
						2013-08-27 10:33:06 -05:00 
						 
				 
			
				
					
						
							
							
								Kenneth Wilke 
							
						 
					 
					
						
						
						
						
							
						
						
							1f71bef33b 
							
						 
					 
					
						
						
							
							jijna syntax fix  
						
						
						
						
					 
					
						2013-08-27 10:30:23 -05:00 
						 
				 
			
				
					
						
							
							
								Kenneth Wilke 
							
						 
					 
					
						
						
						
						
							
						
						
							e104b3eb41 
							
						 
					 
					
						
						
							
							fixed ext_pillar  
						
						
						
						
					 
					
						2013-08-27 10:28:33 -05:00 
						 
				 
			
				
					
						
							
							
								Kenneth Wilke 
							
						 
					 
					
						
						
						
						
							
						
						
							426493b76d 
							
						 
					 
					
						
						
							
							fixed ext_pillar  
						
						
						
						
					 
					
						2013-08-27 10:20:42 -05:00 
						 
				 
			
				
					
						
							
							
								Justin Phelps 
							
						 
					 
					
						
						
						
						
							
						
						
							6282d9570c 
							
						 
					 
					
						
						
							
							Corrected the typo for the minion configuration file.  
						
						
						
						
					 
					
						2013-08-23 16:03:26 -05:00 
						 
				 
			
				
					
						
							
							
								Kenneth Wilke 
							
						 
					 
					
						
						
						
						
							
						
						
							c080cf37d6 
							
						 
					 
					
						
						
							
							ext_pillar fix  
						
						
						
						
					 
					
						2013-08-23 12:01:36 -05:00 
						 
				 
			
				
					
						
							
							
								Kenneth Wilke 
							
						 
					 
					
						
						
						
						
							
						
						
							e83d25b80f 
							
						 
					 
					
						
						
							
							newline fix  
						
						
						
						
					 
					
						2013-08-23 11:57:45 -05:00 
						 
				 
			
				
					
						
							
							
								Kenneth Wilke 
							
						 
					 
					
						
						
						
						
							
						
						
							98fd674c95 
							
						 
					 
					
						
						
							
							indentation fix  
						
						
						
						
					 
					
						2013-08-23 11:55:09 -05:00 
						 
				 
			
				
					
						
							
							
								Kenneth Wilke 
							
						 
					 
					
						
						
						
						
							
						
						
							92b2572734 
							
						 
					 
					
						
						
							
							newline fix  
						
						
						
						
					 
					
						2013-08-23 11:54:12 -05:00 
						 
				 
			
				
					
						
							
							
								Kenneth Wilke 
							
						 
					 
					
						
						
						
						
							
						
						
							153feac309 
							
						 
					 
					
						
						
							
							Edited master template  
						
						... 
						
						
						
						made fileserver_backend and gitfs_remotes look more like expected 
						
						
					 
					
						2013-08-23 11:52:46 -05:00 
						 
				 
			
				
					
						
							
							
								Kenneth Wilke 
							
						 
					 
					
						
						
						
						
							
						
						
							a6667cdb81 
							
						 
					 
					
						
						
							
							Isolated package mapping and some fixes  
						
						... 
						
						
						
						Moved package_table to it's own file, imported by sls files
Moved minion package under watch
Fixed some template mistakes I made 
						
						
					 
					
						2013-08-14 14:53:29 -05:00 
						 
				 
			
				
					
						
							
							
								Kenneth Wilke 
							
						 
					 
					
						
						
						
						
							
						
						
							2420b85913 
							
						 
					 
					
						
						
							
							overhauled minion template  
						
						
						
						
					 
					
						2013-08-14 09:43:46 -05:00 
						 
				 
			
				
					
						
							
							
								Kenneth Wilke 
							
						 
					 
					
						
						
						
						
							
						
						
							2d598ac2ef 
							
						 
					 
					
						
						
							
							corrected spelling mistake  
						
						
						
						
					 
					
						2013-08-13 16:17:53 -05:00 
						 
				 
			
				
					
						
							
							
								Kenneth Wilke 
							
						 
					 
					
						
						
						
						
							
						
						
							539d210896 
							
						 
					 
					
						
						
							
							Overhauled the master template  
						
						
						
						
					 
					
						2013-08-13 16:00:08 -05:00 
						 
				 
			
				
					
						
							
							
								Kenneth Wilke 
							
						 
					 
					
						
						
						
						
							
						
						
							be1cd4ff73 
							
						 
					 
					
						
						
							
							Overhauled master config template  
						
						
						
						
					 
					
						2013-08-13 15:57:58 -05:00 
						 
				 
			
				
					
						
							
							
								Kenneth Wilke 
							
						 
					 
					
						
						
						
						
							
						
						
							b1903eea83 
							
						 
					 
					
						
						
							
							fixed log format string  
						
						
						
						
					 
					
						2013-08-12 17:10:45 -05:00 
						 
				 
			
				
					
						
							
							
								Kenneth Wilke 
							
						 
					 
					
						
						
						
						
							
						
						
							d0df360e5d 
							
						 
					 
					
						
						
							
							Removed template refs, quoted log_datefmt_logfile  
						
						
						
						
					 
					
						2013-08-12 16:45:39 -05:00 
						 
				 
			
				
					
						
							
							
								Kenneth Wilke 
							
						 
					 
					
						
						
						
						
							
						
						
							5403d433a1 
							
						 
					 
					
						
						
							
							fixed small syntax error: geT instead of get  
						
						
						
						
					 
					
						2013-08-12 15:14:23 -05:00 
						 
				 
			
				
					
						
							
							
								Thomas S Hatch 
							
						 
					 
					
						
						
						
						
							
						
						
							fa29decc39 
							
						 
					 
					
						
						
							
							Move into salt subdir  
						
						
						
						
					 
					
						2013-07-27 09:30:56 -06:00 
						 
				 
			
				
					
						
							
							
								Colton Myers 
							
						 
					 
					
						
						
						
						
							
						
						
							46652ebfda 
							
						 
					 
					
						
						
							
							Move everything to root directory for submodule use,  Fix   #4  
						
						
						
						
					 
					
						2013-07-17 09:35:39 -06:00 
						 
				 
			
				
					
						
							
							
								Antoine Cezar 
							
						 
					 
					
						
						
						
						
							
						
						
							0c394abad1 
							
						 
					 
					
						
						
							
							Add minion managed file  
						
						
						
						
					 
					
						2013-07-15 15:08:54 +02:00 
						 
				 
			
				
					
						
							
							
								Ari Lerner 
							
						 
					 
					
						
						
						
						
							
						
						
							3ff270fe9f 
							
						 
					 
					
						
						
							
							Added the entire master configuration to be set in the pillar  
						
						
						
						
					 
					
						2013-06-18 00:17:04 -07:00 
						 
				 
			
				
					
						
							
							
								Thomas S Hatch 
							
						 
					 
					
						
						
						
						
							
						
						
							6a7f64c5ec 
							
						 
					 
					
						
						
							
							Start to paramaterize the master config  
						
						
						
						
					 
					
						2013-06-12 22:42:44 -04:00 
						 
				 
			
				
					
						
							
							
								Thomas S Hatch 
							
						 
					 
					
						
						
						
						
							
						
						
							349a077675 
							
						 
					 
					
						
						
							
							Start on salt formula  
						
						
						
						
					 
					
						2013-06-12 17:53:26 -06:00