Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							4d57ec04ac 
							
						 
					 
					
						
						
							
							Merge branch '4.8'  
						
						 
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> 
						
						
					 
					
						2016-05-03 08:22:37 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nitin Kumar Maharana 
							
						 
					 
					
						
						
						
						
							
						
						
							ba0503d000 
							
						 
					 
					
						
						
							
							CLOUDSTACK-8847: ListServiceOfferings is returning incompatible tagged offerings when called with VM id  
						
						 
						
						... 
						
						
						
						Fixed the subset and superset issue.
Added unit test for the same. 
						
						
					 
					
						2016-01-08 14:17:57 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Koushik Das 
							
						 
					 
					
						
						
						
						
							
						
						
							5b3ffeb6cd 
							
						 
					 
					
						
						
							
							CLOUDSTACK-9130: Make RebootCommand similar to start/stop/migrate agent commands w.r.t. "execute in sequence" flag  
						
						 
						
						... 
						
						
						
						RebootCommand now behaves in the same way as start/stop/migrate agent commands w.r.t. to sequential/parallel execution. 
						
						
					 
					
						2015-12-09 15:19:10 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Boris Schrijver 
							
						 
					 
					
						
						
						
						
							
						
						
							c30ba1df0b 
							
						 
					 
					
						
						
							
							Refactored Nic.java for readability.  
						
						 
						
						... 
						
						
						
						Changed methodnames according to Nic.java refactor.
Fixed NicVO.java due to regression from Nic.java refactor.
Fixed VmWareGuru.java after Nic.java refactor.
See issue CLOUDSTACK-8736 for ongoing effort to clean up network code. 
						
						
					 
					
						2015-08-18 14:04:48 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							7e75f339bc 
							
						 
					 
					
						
						
							
							license and format  
						
						 
						
						
						
						
					 
					
						2015-02-12 14:47:12 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							a9c384fd17 
							
						 
					 
					
						
						
							
							CLOUDSTACK-8238 mocked test to make sure xapi code is called in test for  
						
						 
						
						... 
						
						
						
						pingtask 
						
						
					 
					
						2015-02-10 16:15:24 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Laszlo Hornyak 
							
						 
					 
					
						
						
						
						
							
						
						
							3577423da9 
							
						 
					 
					
						
						
							
							removed executable flags from java classes  
						
						 
						
						... 
						
						
						
						Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com> 
						
						
					 
					
						2014-11-23 19:49:01 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Anthony Xu 
							
						 
					 
					
						
						
						
						
							
						
						
							330c4ba578 
							
						 
					 
					
						
						
							
							completed the new vmsync TODOs in the code.  
						
						 
						
						... 
						
						
						
						removed old vmsync logic 
						
						
					 
					
						2014-07-28 12:51:37 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Devdeep Singh 
							
						 
					 
					
						
						
						
						
							
						
						
							245b7f4c39 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6510: Fix gson serialization exception in storage migration. Gson couldn't serialize  
						
						 
						
						... 
						
						
						
						a map with volume and storagepool objects for logging. Fixed by using volume and storage pool
ids instead of objects in the map. 
						
						
					 
					
						2014-05-08 12:23:46 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Koushik Das 
							
						 
					 
					
						
						
						
						
							
						
						
							5e90b75c98 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6402: Fix StopCommand so that VMs are not removed accidentally as part of vmsync  
						
						 
						
						... 
						
						
						
						Added a new flag 'checkBeforeCleanup' to StopCommand based on which check is done to see if VM is running in HV host.
If VM is running then in this case it is not stopped and the operation bails out.
Also modified the MS code to call the StopCommand with appropriate value for the flag based on the context.
Currently it is only set to 'true' when called from the new vmsync logic based on powerstate of VM. For rest it
is set to 'false' meaning no change in behaviour. 
						
						
					 
					
						2014-04-14 16:52:37 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Marcus Sorensen 
							
						 
					 
					
						
						
						
						
							
						
						
							11f5bdd78d 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6191 Add support for specifying volume provisioning  
						
						 
						
						... 
						
						
						
						type (thin, sparse, fat) in disk/compute offerings.
Submitted-by: Yoshikazu Nojima <mail@ynojima.net>
Reviewed-by: Marcus Sorensen, Mike Tutowski 
						
						
					 
					
						2014-04-10 09:23:04 -06:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								wrodrigues 
							
						 
					 
					
						
						
						
						
							
						
						
							3a7e4103fc 
							
						 
					 
					
						
						
							
							FindBugs findings: fixing equals() methods in 2 classes; commenting out dead variable in 1 class; adding 5 tests to cover the changes in the equals() methods.  
						
						 
						
						... 
						
						
						
						Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com> 
						
						
					 
					
						2014-02-25 15:18:16 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							26b32141a8 
							
						 
					 
					
						
						
							
							Findbugs : Fixes for several findings  
						
						 
						
						... 
						
						
						
						Made a comment on the use of ConcurrentHashMap for _agent
Conflicts:
	engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java 
						
						
					 
					
						2014-02-14 18:37:45 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							8e4d020cf8 
							
						 
					 
					
						
						
							
							remove nic with dhcp and tests  
						
						 
						
						... 
						
						
						
						Signed-off-by: Alena Prokharchyk <alena.prokharchyk@citrix.com> 
						
						
					 
					
						2014-02-13 10:39:02 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							be5e5cc641 
							
						 
					 
					
						
						
							
							All Checkstyle problems corrected  
						
						 
						
						
						
						
					 
					
						2013-12-12 12:26:07 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							d620df2bdd 
							
						 
					 
					
						
						
							
							Reformatted all of the code.  
						
						 
						
						
						
						
					 
					
						2013-11-21 06:15:26 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							8d62744681 
							
						 
					 
					
						
						
							
							Reformat all source code.  Added checkstyle to check the source code  
						
						 
						
						
						
						
					 
					
						2013-11-20 07:26:53 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							d37b87d97a 
							
						 
					 
					
						
						
							
							Fix a few xml wellformedness issues  
						
						 
						
						
						
						
					 
					
						2013-09-21 14:58:56 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							8f556e6d88 
							
						 
					 
					
						
						
							
							Made changes to configuration.  Eliminated ConfigValue and only use ConfigKey  
						
						 
						
						
						
						
					 
					
						2013-09-06 15:40:38 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							6e8ca99466 
							
						 
					 
					
						
						
							
							Got all of the config stuff out of the way  
						
						 
						
						
						
						
					 
					
						2013-09-06 15:40:36 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							435e74e914 
							
						 
					 
					
						
						
							
							Commit to try something on removing getZone  
						
						 
						
						
						
						
					 
					
						2013-09-06 15:40:33 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							8e5249df62 
							
						 
					 
					
						
						
							
							Moved NetworkManager to NetworkOrchestrationService  
						
						 
						
						
						
						
					 
					
						2013-09-06 15:40:31 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							abbae2aa87 
							
						 
					 
					
						
						
							
							Fixed the problem with offerings and templates.  These two items due to a previous patch all the way back in 2.1.x versions uses the removed column incorrectly.  No one fixed since then.  Hence, there's a bunch of findbyidincludingremoved calls in the cloudstack code around these two items.  
						
						 
						
						
						
						
					 
					
						2013-08-26 17:31:10 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							564502abd7 
							
						 
					 
					
						
						
							
							Moved the virtualmachine implementation into engine/orchestration  
						
						 
						
						
						
						
					 
					
						2013-08-19 14:13:28 -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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							1b408509d6 
							
						 
					 
					
						
						
							
							CLOUDSTACK-1332: Add IPv6 DNS for Zone  
						
						 
						
						
						
						
					 
					
						2013-02-25 16:08:10 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							3cc9f3ff06 
							
						 
					 
					
						
						
							
							Adding defaults to new columns  
						
						 
						
						
						
						
					 
					
						2013-01-22 12:54:12 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							e6cd47ddc0 
							
						 
					 
					
						
						
							
							More changes for deployVM flow.  
						
						 
						
						
						
						
					 
					
						2013-01-22 12:54:07 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							ea3f5ecb54 
							
						 
					 
					
						
						
							
							Fix license for xml files in javelin  
						
						 
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2013-01-12 06:31:47 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							ba20e7f85a 
							
						 
					 
					
						
						
							
							Fix license headers for java files in javelin  
						
						 
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2013-01-12 06:27:09 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							7e61e200a6 
							
						 
					 
					
						
						
							
							Register Host and unit test  
						
						 
						
						
						
						
					 
					
						2013-01-03 11:44:39 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							3ff3a47e36 
							
						 
					 
					
						
						
							
							Provisioning Service: register Pod, Cluster, Deregister Zone/Pod/Cluster and unit tests  
						
						 
						
						
						
						
					 
					
						2013-01-03 11:44:37 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							1eb64e6181 
							
						 
					 
					
						
						
							
							ProvisioningService:: registerZone changes and unit-test  
						
						 
						
						
						
						
					 
					
						2013-01-03 11:44:36 -08:00