| 
							
							
								 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 |  |