abhishek 
							
						 
					 
					
						
						
						
						
							
						
						
							8f54cac031 
							
						 
					 
					
						
						
							
							Resolve conflicts  
						
						 
						
						... 
						
						
						
						Merge branch '2.1.refactor' of ssh://git.cloud.com/var/lib/git/cloudstack-oss into 2.1.refactor
Conflicts:
	server/src/com/cloud/api/BaseCmd.java 
						
						
					 
					
						2010-08-18 10:41:34 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								abhishek 
							
						 
					 
					
						
						
						
						
							
						
						
							e553bcde96 
							
						 
					 
					
						
						
							
							Refactoring the updateResourceLimits code, moving all logic to agent manager, updating the enum with a new manager type for reflection  
						
						 
						
						
						
						
					 
					
						2010-08-18 10:32:21 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kishan 
							
						 
					 
					
						
						
						
						
							
						
						
							d202ce4c7a 
							
						 
					 
					
						
						
							
							Issue #: 5775  
						
						 
						
						... 
						
						
						
						Release vnet and private IP allocation when domR fails to start 
						
						
					 
					
						2010-08-18 19:43:16 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kishan 
							
						 
					 
					
						
						
						
						
							
						
						
							fb8e3ffec5 
							
						 
					 
					
						
						
							
							Merge branch 'master' of ssh://kishan@git.cloud.com/var/lib/git/cloudstack-oss  
						
						 
						
						
						
						
					 
					
						2010-08-18 14:09:13 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kishan 
							
						 
					 
					
						
						
						
						
							
						
						
							ef41ebc9ec 
							
						 
					 
					
						
						
							
							Check for null vnet when allocation fails  
						
						 
						
						
						
						
					 
					
						2010-08-18 13:54:53 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								nit 
							
						 
					 
					
						
						
						
						
							
						
						
							ddbdb880e6 
							
						 
					 
					
						
						
							
							Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss  
						
						 
						
						
						
						
					 
					
						2010-08-18 13:46:11 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Manuel Amador (Rudd-O) 
							
						 
					 
					
						
						
						
						
							
						
						
							b70307eb1a 
							
						 
					 
					
						
						
							
							Revert "Added cloud-qemu-system dependency on packages"  
						
						 
						
						... 
						
						
						
						This reverts commit f8e7b3ff5ff767bfcfd9b8004a4916a9350da953. 
						
						
					 
					
						2010-08-18 00:35:49 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Manuel Amador (Rudd-O) 
							
						 
					 
					
						
						
						
						
							
						
						
							467a435659 
							
						 
					 
					
						
						
							
							Revert "Correct name of cloud-qemu package"  
						
						 
						
						... 
						
						
						
						This reverts commit b3cf83c94eef6540198009b65af3b4cf48fac78e. 
						
						
					 
					
						2010-08-18 00:35:38 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								nitin 
							
						 
					 
					
						
						
						
						
							
						
						
							5331e13bac 
							
						 
					 
					
						
						
							
							5844 - adding more tags to  updateTemplate API  
						
						 
						
						
						
						
					 
					
						2010-08-18 12:44:27 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kris McQueen 
							
						 
					 
					
						
						
						
						
							
						
						
							261c96f99c 
							
						 
					 
					
						
						
							
							refactor createPod command to new API framework  
						
						 
						
						
						
						
					 
					
						2010-08-17 19:08:06 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kris McQueen 
							
						 
					 
					
						
						
						
						
							
						
						
							21ab91dc2c 
							
						 
					 
					
						
						
							
							refactoring CreateNetworkGroup API command to new API framework  
						
						 
						
						
						
						
					 
					
						2010-08-17 19:07:00 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kris McQueen 
							
						 
					 
					
						
						
						
						
							
						
						
							82d6edcdf3 
							
						 
					 
					
						
						
							
							Refactoring CreateIPForwardingRule and CreateLoadBalancerRule to new API framework  
						
						 
						
						
						
						
					 
					
						2010-08-17 19:07:00 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kris McQueen 
							
						 
					 
					
						
						
						
						
							
						
						
							a6c34d422c 
							
						 
					 
					
						
						
							
							Work in progress for modifying createPortForwardingRule command.  
						
						 
						
						... 
						
						
						
						- some of the logic has been moved to manager
  - some annotations have been added for the command itself 
						
						
					 
					
						2010-08-17 19:07:00 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								abhishek 
							
						 
					 
					
						
						
						
						
							
						
						
							154c6985a4 
							
						 
					 
					
						
						
							
							Refactoring updatePod command  
						
						 
						
						
						
						
					 
					
						2010-08-17 17:55:38 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								abhishek 
							
						 
					 
					
						
						
						
						
							
						
						
							1252a2b8a7 
							
						 
					 
					
						
						
							
							Refactoring update service offering cmd  
						
						 
						
						
						
						
					 
					
						2010-08-17 17:21:04 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								abhishek 
							
						 
					 
					
						
						
						
						
							
						
						
							1174486e27 
							
						 
					 
					
						
						
							
							Refactoring into server project  
						
						 
						
						
						
						
					 
					
						2010-08-17 16:43:57 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								abhishek 
							
						 
					 
					
						
						
						
						
							
						
						
							57edd7d2f8 
							
						 
					 
					
						
						
							
							Refactoring the StorageManager interface into server code  
						
						 
						
						
						
						
					 
					
						2010-08-17 16:43:01 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								abhishek 
							
						 
					 
					
						
						
						
						
							
						
						
							8b8f126a2c 
							
						 
					 
					
						
						
							
							Called the wrong method, fixing the same  
						
						 
						
						
						
						
					 
					
						2010-08-17 16:11:44 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								abhishek 
							
						 
					 
					
						
						
						
						
							
						
						
							7e502768ed 
							
						 
					 
					
						
						
							
							Incremental checkin  
						
						 
						
						
						
						
					 
					
						2010-08-17 16:07:48 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Manuel Amador (Rudd-O) 
							
						 
					 
					
						
						
						
						
							
						
						
							b3cf83c94e 
							
						 
					 
					
						
						
							
							Correct name of cloud-qemu package  
						
						 
						
						
						
						
					 
					
						2010-08-17 15:44:06 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Manuel Amador (Rudd-O) 
							
						 
					 
					
						
						
						
						
							
						
						
							f8e7b3ff5f 
							
						 
					 
					
						
						
							
							Added cloud-qemu-system dependency on packages  
						
						 
						
						
						
						
					 
					
						2010-08-17 15:40:25 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								abhishek 
							
						 
					 
					
						
						
						
						
							
						
						
							492fa760ff 
							
						 
					 
					
						
						
							
							Removing unused imports  
						
						 
						
						
						
						
					 
					
						2010-08-17 15:19:09 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								abhishek 
							
						 
					 
					
						
						
						
						
							
						
						
							fffd1f2099 
							
						 
					 
					
						
						
							
							Refactoring permissions commands  
						
						 
						
						
						
						
					 
					
						2010-08-17 15:18:00 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							627e65e102 
							
						 
					 
					
						
						
							
							Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss  
						
						 
						
						
						
						
					 
					
						2010-08-17 15:16:49 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							53097c67f5 
							
						 
					 
					
						
						
							
							1) Fix build problem caused by alex's Refactoring  
						
						 
						
						... 
						
						
						
						2) Let console proxy servlet support API key to allow session-less access 
						
						
					 
					
						2010-08-17 15:15:06 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								abhishek 
							
						 
					 
					
						
						
						
						
							
						
						
							67b8a9e608 
							
						 
					 
					
						
						
							
							Incremental checkin  
						
						 
						
						
						
						
					 
					
						2010-08-17 14:52:29 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							1849d4a6b1 
							
						 
					 
					
						
						
							
							Issue #: 5894  
						
						 
						
						... 
						
						
						
						Create Template from Snapshot dialog - add password dropdown field 
						
						
					 
					
						2010-08-17 14:25:54 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								abhishek 
							
						 
					 
					
						
						
						
						
							
						
						
							4114c1b74a 
							
						 
					 
					
						
						
							
							Adding the updatetemplateoriso command refactoring,  
						
						 
						
						
						
						
					 
					
						2010-08-17 14:14:16 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								abhishek 
							
						 
					 
					
						
						
						
						
							
						
						
							c092b78c47 
							
						 
					 
					
						
						
							
							Changing the manager  
						
						 
						
						
						
						
					 
					
						2010-08-17 12:22:26 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								abhishek 
							
						 
					 
					
						
						
						
						
							
						
						
							001fc0f7ae 
							
						 
					 
					
						
						
							
							Refactoring update user command  
						
						 
						
						
						
						
					 
					
						2010-08-17 12:12:07 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								abhishek 
							
						 
					 
					
						
						
						
						
							
						
						
							6f680375f3 
							
						 
					 
					
						
						
							
							Refactoring some more vm commands, as well as refactoring the account and user validation into a method. Please use the same for future validation calls  
						
						 
						
						
						
						
					 
					
						2010-08-17 11:28:23 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							b104bbb511 
							
						 
					 
					
						
						
							
							ignore override and bin and logfiles properly  
						
						 
						
						
						
						
					 
					
						2010-08-17 11:09:12 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								abhishek 
							
						 
					 
					
						
						
						
						
							
						
						
							a4ab5fa38d 
							
						 
					 
					
						
						
							
							Creating a new response obj file  
						
						 
						
						
						
						
					 
					
						2010-08-17 10:56:06 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								abhishek 
							
						 
					 
					
						
						
						
						
							
						
						
							7a937685b0 
							
						 
					 
					
						
						
							
							Adding the response object for UpgradeVmResponse  
						
						 
						
						
						
						
					 
					
						2010-08-17 10:54:01 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							e077b23d98 
							
						 
					 
					
						
						
							
							stupid git  
						
						 
						
						
						
						
					 
					
						2010-08-17 10:26:34 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							a89aad4d15 
							
						 
					 
					
						
						
							
							removed override  
						
						 
						
						
						
						
					 
					
						2010-08-17 10:16:16 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								abhishek 
							
						 
					 
					
						
						
						
						
							
						
						
							3870d8f1dc 
							
						 
					 
					
						
						
							
							Some more refactoring  
						
						 
						
						
						
						
					 
					
						2010-08-17 10:07:57 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								abhishek 
							
						 
					 
					
						
						
						
						
							
						
						
							b0cfdf1f37 
							
						 
					 
					
						
						
							
							Fixing some more issues in management server (do not know why this was not backported)  
						
						 
						
						
						
						
					 
					
						2010-08-17 10:04:09 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								abhishek 
							
						 
					 
					
						
						
						
						
							
						
						
							1a0415601f 
							
						 
					 
					
						
						
							
							Incremental checkin  
						
						 
						
						
						
						
					 
					
						2010-08-17 10:00:09 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kris McQueen 
							
						 
					 
					
						
						
						
						
							
						
						
							663f982628 
							
						 
					 
					
						
						
							
							Add ResponseObject interface.  
						
						 
						
						
						
						
					 
					
						2010-08-16 18:14:21 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kris McQueen 
							
						 
					 
					
						
						
						
						
							
						
						
							5ed3ec9192 
							
						 
					 
					
						
						
							
							Add response object interface.  
						
						 
						
						... 
						
						
						
						Add response objects for CreateDiskOffering and CreateDomain.
Move validation of parameters for CreateDiskOffering and CreateDomain to business logic, add getResponse logic for these commands. 
						
						
					 
					
						2010-08-16 18:12:31 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Anthony Xu 
							
						 
					 
					
						
						
						
						
							
						
						
							334b2f7d27 
							
						 
					 
					
						
						
							
							bug 5939: script to clean xenstore disk  
						
						 
						
						
						
						
					 
					
						2010-08-16 17:06:20 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							c5f822ca7a 
							
						 
					 
					
						
						
							
							Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss  
						
						 
						
						
						
						
					 
					
						2010-08-16 11:30:22 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							c21bc7072c 
							
						 
					 
					
						
						
							
							more changes  
						
						 
						
						
						
						
					 
					
						2010-08-16 11:30:04 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							867b43dcf9 
							
						 
					 
					
						
						
							
							more changes for the rewrite.  
						
						 
						
						
						
						
					 
					
						2010-08-16 11:28:11 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							e78f05599c 
							
						 
					 
					
						
						
							
							Test verification with vim2.5  
						
						 
						
						
						
						
					 
					
						2010-08-16 11:12:11 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								abhishek 
							
						 
					 
					
						
						
						
						
							
						
						
							b4d6baf044 
							
						 
					 
					
						
						
							
							Fixing the multiplying factor issue  
						
						 
						
						
						
						
					 
					
						2010-08-16 10:05:46 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								root 
							
						 
					 
					
						
						
						
						
							
						
						
							183eb4e4a3 
							
						 
					 
					
						
						
							
							Api refactoring for following commands: updateAccount, updateTemplate/Iso, UpdateDomain, EnableUser/Account, DeletePod  
						
						 
						
						
						
						
					 
					
						2010-08-15 21:01:24 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								edison 
							
						 
					 
					
						
						
						
						
							
						
						
							900b9e2f2f 
							
						 
					 
					
						
						
							
							Merge branch 'addhost'  
						
						 
						
						
						
						
					 
					
						2010-08-13 23:26:16 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								edison 
							
						 
					 
					
						
						
						
						
							
						
						
							53df26daaa 
							
						 
					 
					
						
						
							
							"Add host" for kvm:  
						
						 
						
						... 
						
						
						
						The sequence:
1. add host in UI
2. scp setup_agent.sh to agent host, and execute it. This script receives hostip,zoneid, podid and guid, then runs "cloud-setup-agent" and "cloud-setup-console-proxy". Here, we assume that network/hostname and cloud-agent are already configed and installed.
3. Write a dummy kvm resource into the database, then wait for agent connects to server, by polling the database for every 1 minutes. If it finds the agent is in UP state in database, then return, or wait for at least 10 minutes. 
						
						
					 
					
						2010-08-13 23:19:36 -07:00