Merge "Trusty juno updates"
This commit is contained in:
		@@ -12,12 +12,12 @@ SUSE_OPTS = {
 | 
			
		||||
}
 | 
			
		||||
REDHAT_OPTS = {
 | 
			
		||||
  platform: 'redhat',
 | 
			
		||||
  version: '6.5',
 | 
			
		||||
  version: '7.0',
 | 
			
		||||
  log_level: LOG_LEVEL
 | 
			
		||||
}
 | 
			
		||||
UBUNTU_OPTS = {
 | 
			
		||||
  platform: 'ubuntu',
 | 
			
		||||
  version: '12.04',
 | 
			
		||||
  version: '14.04',
 | 
			
		||||
  log_level: LOG_LEVEL
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user