Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							a5416797ab 
							
						 
					 
					
						
						
							
							Move previous AncientImageDataStore provider and DefaultImageDataStore  
						
						 
						
						... 
						
						
						
						provider code into plugins. 
						
						
					 
					
						2013-04-05 11:18:32 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							b0cbe260f9 
							
						 
					 
					
						
						
							
							New VO and DAO for snapshot, template and volume association table with  
						
						 
						
						... 
						
						
						
						image_data_store. 
						
						
					 
					
						2013-04-05 11:18:32 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							f18a1d6f14 
							
						 
					 
					
						
						
							
							fix bunch of bugs related to zone wide storage  
						
						 
						
						
						
						
					 
					
						2013-04-03 21:51:17 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Spindler 
							
						 
					 
					
						
						
						
						
							
						
						
							469c4dd139 
							
						 
					 
					
						
						
							
							Removing ^M's from code.  
						
						 
						
						... 
						
						
						
						Signed-off-by: Prasanna Santhanam <tsp@apache.org> 
						
						
					 
					
						2013-04-04 00:53:20 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Harikrishna Patnala 
							
						 
					 
					
						
						
						
						
							
						
						
							6110e00c54 
							
						 
					 
					
						
						
							
							CLOUDSTACK-1830: ZWPS: NPE while create volume from snapshot  
						
						 
						
						
						
						
					 
					
						2013-04-02 10:40:42 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							c52d04cd63 
							
						 
					 
					
						
						
							
							Correct a naming typo.  
						
						 
						
						
						
						
					 
					
						2013-03-28 10:23:55 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							c8fd16c03d 
							
						 
					 
					
						
						
							
							Summary: Workaround for CLOUDSTACK-1831 and CLOUDSTACK-1672  
						
						 
						
						... 
						
						
						
						Exclude the transient dependency on jaxb-impl 2.1.13 in cxf-bundle-jars.
VmWare code depends on the 2.0 version 
						
						
					 
					
						2013-03-28 15:00:04 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							3ed6200ef8 
							
						 
					 
					
						
						
							
							move default primary storage plugin into its own pom  
						
						 
						
						
						
						
					 
					
						2013-03-20 17:21:40 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							c60ef79321 
							
						 
					 
					
						
						
							
							CLOUDSTACK-1608: don't support attach volume between different storage scopes  
						
						 
						
						
						
						
					 
					
						2013-03-19 14:36:37 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Deepti Dohare 
							
						 
					 
					
						
						
						
						
							
						
						
							d5cb32f159 
							
						 
					 
					
						
						
							
							Multiple Secondary Storage Issue  
						
						 
						
						
						
						
					 
					
						2013-03-14 21:08:27 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Deepti Dohare 
							
						 
					 
					
						
						
						
						
							
						
						
							27b753a434 
							
						 
					 
					
						
						
							
							CLOUDSTACK-1575 Failed to transit volume with uploadVolume  
						
						 
						
						... 
						
						
						
						Signed-off-by: Abhinandan Prateek <aprateek@apache.org> 
						
						
					 
					
						2013-03-13 10:40:08 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							409ec9c6b6 
							
						 
					 
					
						
						
							
							CLOUDSTACK-1426: We has strong implication that VO must implement an interface, otherwise EntityManagerImpl can't the vo  
						
						 
						
						
						
						
					 
					
						2013-03-07 18:25:57 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							cc91d826df 
							
						 
					 
					
						
						
							
							Fix conflicts in storage subsystem with Spring  
						
						 
						
						
						
						
					 
					
						2013-03-05 19:03:31 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							333dd810d2 
							
						 
					 
					
						
						
							
							CLOUDSTACK-1339: Using Sping interface injection pattern to avoid using CGLIB proxying mode. Spring with CGLIB proxying will concflict with CGLIB usage in CloudStack DB code, CloudStack CGLIB usage can cause Spring to lose tack of its proxied object and therefore creates a massive amount of objects in memory  
						
						 
						
						
						
						
					 
					
						2013-03-05 19:03:30 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							69678c82ac 
							
						 
					 
					
						
						
							
							suddenly, maven can't build this java file  
						
						 
						
						
						
						
					 
					
						2013-03-04 17:23:27 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							54bfd7e04a 
							
						 
					 
					
						
						
							
							orchestration: Fix VirtualMachineEntityFactory to process spring injections  
						
						 
						
						... 
						
						
						
						The bug was found was Harikrishna P. when iso was used, in case of Isos, the
create vm from scratch which fails due to factory being used to get the object
which is not spring injected
Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2013-02-28 17:28:15 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							cc81413931 
							
						 
					 
					
						
						
							
							CLOUDSTACK-724: add zone wide storage, createstoragepoolcmd doesn't need cluster/pod any more  
						
						 
						
						
						
						
					 
					
						2013-02-26 23:16:17 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Harikrishna Patnala 
							
						 
					 
					
						
						
						
						
							
						
						
							254275dc26 
							
						 
					 
					
						
						
							
							CLOUDSTACK-1293: resetpasswordforVm shows "passsd reset to undefined"  
						
						 
						
						
						
						
					 
					
						2013-02-27 12:35:04 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								David Nalley 
							
						 
					 
					
						
						
						
						
							
						
						
							dc6b4b54fa 
							
						 
					 
					
						
						
							
							adding license headers  
						
						 
						
						
						
						
					 
					
						2013-02-27 01:42:19 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							0e6290ba87 
							
						 
					 
					
						
						
							
							fix build  
						
						 
						
						
						
						
					 
					
						2013-02-26 18:50:48 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							8e360f342d 
							
						 
					 
					
						
						
							
							CLOUDSTACK-724: add basic zone wide storage support, refactor storage allocator, need ui support  
						
						 
						
						
						
						
					 
					
						2013-02-26 18:39:23 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mice Xia 
							
						 
					 
					
						
						
						
						
							
						
						
							46e91bd794 
							
						 
					 
					
						
						
							
							fix issue: failed to start vm from iso caused by ClassCastException and NPE  
						
						 
						
						
						
						
					 
					
						2013-02-26 17:01:26 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							1b408509d6 
							
						 
					 
					
						
						
							
							CLOUDSTACK-1332: Add IPv6 DNS for Zone  
						
						 
						
						
						
						
					 
					
						2013-02-25 16:08:10 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							3bb713c5ce 
							
						 
					 
					
						
						
							
							fix adding nfs primary storage and build and load  
						
						 
						
						
						
						
					 
					
						2013-02-21 16:24:39 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							15ead099a1 
							
						 
					 
					
						
						
							
							CloudStack CLOUDSTACK-774  
						
						 
						
						... 
						
						
						
						Supporting kickstart in CloudStack baremetal
able to start vm
Conflicts:
	client/tomcatconf/componentContext.xml.in
	server/src/com/cloud/baremetal/BareMetalTemplateAdapter.java
	server/src/com/cloud/baremetal/BareMetalVmManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java 
						
						
					 
					
						2013-02-21 15:48:08 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chip Childers 
							
						 
					 
					
						
						
						
						
							
						
						
							6cc1123a3e 
							
						 
					 
					
						
						
							
							Correcting license headers that broke the build  
						
						 
						
						... 
						
						
						
						Signed-off-by: Chip Childers <chip.childers@gmail.com> 
						
						
					 
					
						2013-02-21 16:29:05 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							ae902590d3 
							
						 
					 
					
						
						
							
							fix snapshot  
						
						 
						
						
						
						
					 
					
						2013-02-21 11:22:50 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							fb4036ece4 
							
						 
					 
					
						
						
							
							add test folder for snpahost project  
						
						 
						
						
						
						
					 
					
						2013-02-21 11:22:49 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							0f532c4b3a 
							
						 
					 
					
						
						
							
							rebase to master  
						
						 
						
						
						
						
					 
					
						2013-02-21 11:22:49 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							ff047e75d3 
							
						 
					 
					
						
						
							
							refactor snapshot, move existing snapshot code into its own snapshotstrategy  
						
						 
						
						
						
						
					 
					
						2013-02-21 11:22:49 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							020be66f9d 
							
						 
					 
					
						
						
							
							add copy volume and create volume from snapshot  
						
						 
						
						
						
						
					 
					
						2013-02-21 11:22:49 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							621a779446 
							
						 
					 
					
						
						
							
							use correct disk offering id  
						
						 
						
						
						
						
					 
					
						2013-02-21 11:22:49 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							ec09e34f86 
							
						 
					 
					
						
						
							
							fix downloading template  
						
						 
						
						
						
						
					 
					
						2013-02-21 11:22:48 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							a22403edcd 
							
						 
					 
					
						
						
							
							squash changes into one giant patch  
						
						 
						
						
						
						
					 
					
						2013-02-21 11:22:48 -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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							9755d9b4a2 
							
						 
					 
					
						
						
							
							Keep naming more or less consistent  
						
						 
						
						
						
						
					 
					
						2013-02-02 12:43:15 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							7b75f0d990 
							
						 
					 
					
						
						
							
							Sync master to javelin one more time  
						
						 
						
						
						
						
					 
					
						2013-02-01 11:37:33 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							176523254e 
							
						 
					 
					
						
						
							
							Improve component lifecycle management with system run-level concept  
						
						 
						
						
						
						
					 
					
						2013-01-30 15:21:02 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							1450547987 
							
						 
					 
					
						
						
							
							Put usage server under Spring  
						
						 
						
						
						
						
					 
					
						2013-01-25 23:00:55 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							6f5655cb03 
							
						 
					 
					
						
						
							
							generalize storage orchestration: DataObjectManager will handle all the object life cycle management  
						
						 
						
						
						
						
					 
					
						2013-01-24 18:30:08 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							d182e64897 
							
						 
					 
					
						
						
							
							GenericDao maintains a map of VO interface -> DaoImpl. Since cloud-engine is not yet a separate service, we need to introduce dummy interfaces to load both CloudStack API daoImpls and engine daoImpls  
						
						 
						
						
						
						
					 
					
						2013-01-23 17:59:15 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							e67381b76d 
							
						 
					 
					
						
						
							
							Fix NPE with volume reservation  
						
						 
						
						
						
						
					 
					
						2013-01-23 16:41:29 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							baae73cc05 
							
						 
					 
					
						
						
							
							rat: Fix licenses on engine/orchestration/src.o.a.cloudstack.engine.cloud.api.db  
						
						 
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2013-01-23 16:26:55 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							45a92ba369 
							
						 
					 
					
						
						
							
							Fix the initialization of management server  
						
						 
						
						
						
						
					 
					
						2013-01-23 15:29:41 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							e5bf16b00f 
							
						 
					 
					
						
						
							
							Fixing error with merge  
						
						 
						
						
						
						
					 
					
						2013-01-22 16:44:28 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							e4e2cf6be7 
							
						 
					 
					
						
						
							
							skip test in cloud engine  
						
						 
						
						
						
						
					 
					
						2013-01-22 13:25:48 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							c921118c58 
							
						 
					 
					
						
						
							
							add image create test case  
						
						 
						
						
						
						
					 
					
						2013-01-22 13:25:48 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							aa7b3e0f6d 
							
						 
					 
					
						
						
							
							Renaming VmInstanceVO: dataCenterIdToDeployIn to dataCenterId  
						
						 
						
						... 
						
						
						
						Corresponding getter/setter is renamed too.
Reason is GenericDao does not update the field unless the method name matches the field name; the setter of this VO was one such case. 
						
						
					 
					
						2013-01-22 12:56:39 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							2adce8e712 
							
						 
					 
					
						
						
							
							Fixes to VO stuff  
						
						 
						
						
						
						
					 
					
						2013-01-22 12:54:22 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							3cc9f3ff06 
							
						 
					 
					
						
						
							
							Adding defaults to new columns  
						
						 
						
						
						
						
					 
					
						2013-01-22 12:54:12 -08:00