Brian Spindler 
							
						 
					 
					
						
						
						
						
							
						
						
							469c4dd139 
							
						 
					 
					
						
						
							
							Removing ^M's from code.  
						
						... 
						
						
						
						Signed-off-by: Prasanna Santhanam <tsp@apache.org> 
						
						
					 
					
						2013-04-04 00:53:20 +05:30 
						 
				 
			
				
					
						
							
							
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							e5c542aaf1 
							
						 
					 
					
						
						
							
							rat: Fix the license, the mouse is squeaking, Frank stepped on it :)  
						
						
						
						
					 
					
						2013-03-01 11:19:27 +05:30 
						 
				 
			
				
					
						
							
							
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							bd0fc2f354 
							
						 
					 
					
						
						
							
							CloudStack CLOUDSTACK-723  
						
						... 
						
						
						
						Enhanced baremetal servers support on Cisco UCS
change UcsXxxDao to Spring xml loading
change ListxxxCmd to inherit ListCmd
change API response in line with current API architecture
adding missing db schema  to db upgrade schemaOh
Conflicts:
	client/pom.xml
	plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsBladeDaoImpl.java
	plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsManagerDaoImpl.java 
						
						
					 
					
						2013-02-28 15:42:48 -08:00 
						 
				 
			
				
					
						
							
							
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							dcef281bad 
							
						 
					 
					
						
						
							
							CloudStack CLOUDSTACK-723  
						
						... 
						
						
						
						Enhanced baremetal servers support on Cisco UCS
change API response in line with new API response convention
Conflicts:
	api/src/org/apache/cloudstack/api/ApiConstants.java 
						
						
					 
					
						2013-02-28 15:40:41 -08:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							3bb713c5ce 
							
						 
					 
					
						
						
							
							fix adding nfs primary storage and build and load  
						
						
						
						
					 
					
						2013-02-21 16:24:39 -08:00 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							80d58b6c73 
							
						 
					 
					
						
						
							
							CLOUDSTACK-1317: Bump CloudStack package version to 4.2.0-SNAPSHOT in all poms  
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2013-02-20 16:42:56 +05:30 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							fec9934656 
							
						 
					 
					
						
						
							
							ucs: Fix ucs plugin's pom, removes xml marktag  
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2013-02-02 09:16:17 -08:00 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							c9e764818b 
							
						 
					 
					
						
						
							
							rat: Fix license headers on ucs plugin etc.  
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2013-02-02 08:57:16 -08:00 
						 
				 
			
				
					
						
							
							
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							9755d9b4a2 
							
						 
					 
					
						
						
							
							Keep naming more or less consistent  
						
						
						
						
					 
					
						2013-02-02 12:43:15 +01:00 
						 
				 
			
				
					
						
							
							
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							8416d81b99 
							
						 
					 
					
						
						
							
							Merge branch 'ucs' into javelin  
						
						... 
						
						
						
						Conflicts:
	api/src/org/apache/cloudstack/api/ApiConstants.java
	plugins/pom.xml
	utils/src/com/cloud/utils/exception/CloudRuntimeException.java
	utils/src/com/cloud/utils/exception/RuntimeCloudException.java 
						
						
					 
					
						2013-01-31 14:44:07 -08:00 
						 
				 
			
				
					
						
							
							
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							1a1d716d90 
							
						 
					 
					
						
						
							
							CloudStack CLOUDSTACK-723  
						
						... 
						
						
						
						Enhanced baremetal servers support on Cisco UCS 
						
						
					 
					
						2013-01-28 16:30:06 -08:00 
						 
				 
			
				
					
						
							
							
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							997e9fb7b0 
							
						 
					 
					
						
						
							
							CloudStack CLOUDSTACK-723  
						
						... 
						
						
						
						Enhanced baremetal servers support on Cisco UCS 
						
						
					 
					
						2013-01-28 16:29:54 -08:00 
						 
				 
			
				
					
						
							
							
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							301b0b9090 
							
						 
					 
					
						
						
							
							CloudStack CLOUDSTACK-723  
						
						... 
						
						
						
						Enhanced baremetal servers support on Cisco UCS
init 
						
						
					 
					
						2013-01-25 15:00:09 -08:00