Ajna Cackovic
							
						 
					 | 
					
						
						
						
						
							
						
						
							9dab2f9dab
							
						
					 | 
					
						
						
							
							Update pillar.example to show gitfs_remotes option usage
						
						
						
						
						
						
					 | 
					
						2014-10-23 18:33:16 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Seth House
							
						 
					 | 
					
						
						
						
						
							
						
						
							1682df8592
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/pr/47'
						
						
						
						
						
						
						
						Conflicts:
	salt/master.sls
	salt/minion.sls 
						
						
					 | 
					
						2014-10-09 16:39:07 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrew Vant
							
						 
					 | 
					
						
						
						
						
							
						
						
							970da0ef37
							
						
					 | 
					
						
						
							
							Added salt-cloud support for Rackspace OpenStack servers.
						
						
						
						
						
						
					 | 
					
						2014-10-03 21:23:50 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Kevin Bowling
							
						 
					 | 
					
						
						
						
						
							
						
						
							8c10d8c776
							
						
					 | 
					
						
						
							
							Pillar example whitespace
						
						
						
						
						
						
					 | 
					
						2014-10-01 23:44:48 -07: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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Kenneth Wilke
							
						 
					 | 
					
						
						
						
						
							
						
						
							9404ebf915
							
						
					 | 
					
						
						
							
							Added module_config section to minion template
						
						
						
						
						
						
					 | 
					
						2013-09-03 09:45:24 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Kenneth Wilke
							
						 
					 | 
					
						
						
						
						
							
						
						
							71418cd1d7
							
						
					 | 
					
						
						
							
							pillar example fix
						
						
						
						
						
						
					 | 
					
						2013-08-13 16:40:48 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Kenneth Wilke
							
						 
					 | 
					
						
						
						
						
							
						
						
							8060db1c7b
							
						
					 | 
					
						
						
							
							used saltstack formulas repo instead of my own
						
						
						
						
						
						
					 | 
					
						2013-08-12 17:37:38 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Kenneth Wilke
							
						 
					 | 
					
						
						
						
						
							
						
						
							48d89a5485
							
						
					 | 
					
						
						
							
							added pillar example
						
						
						
						
						
						
					 | 
					
						2013-08-12 17:35:25 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael Grosser
							
						 
					 | 
					
						
						
						
						
							
						
						
							c431ed9119
							
						
					 | 
					
						
						
							
							Add pillar.example
						
						
						
						
						
						
					 | 
					
						2013-07-27 23:33:33 +02:00 | 
					
					
						
						
							
							
							
						
					 |