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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							66ccd6f7ad 
							
						 
					 
					
						
						
							
							(1) When hypervisor.type is kvm, allow option to add host in UI.  
						
						 
						
						... 
						
						
						
						(2) When when hypervisor.type is kvm, hide cluster section in add host dialog. 
						
						
					 
					
						2010-08-13 18:19:55 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							b4adabe4a9 
							
						 
					 
					
						
						
							
							Refactored EnableAccount api command  
						
						 
						
						
						
						
					 
					
						2010-08-13 17:51:00 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								will 
							
						 
					 
					
						
						
						
						
							
						
						
							7cf14dcffa 
							
						 
					 
					
						
						
							
							Test commit  
						
						 
						
						
						
						
					 
					
						2010-08-13 16:36:30 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Anthony Xu 
							
						 
					 
					
						
						
						
						
							
						
						
							642d0dfe8a 
							
						 
					 
					
						
						
							
							Issue #: 5917  
						
						 
						
						... 
						
						
						
						if we found the SR, we'll never create it again. 
						
						
					 
					
						2010-08-13 15:17:33 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								abhishek 
							
						 
					 
					
						
						
						
						
							
						
						
							5326d0ec89 
							
						 
					 
					
						
						
							
							bug 5922: Checking if bug db updates works  
						
						 
						
						... 
						
						
						
						status 5922: resolved fixed 
						
						
					 
					
						2010-08-13 14:07:55 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								abhishek 
							
						 
					 
					
						
						
						
						
							
						
						
							7d14dd7576 
							
						 
					 
					
						
						
							
							Issue :# 5922  
						
						 
						
						... 
						
						
						
						Status 5922: Resolved Fixed
Fix for 5922 
						
						
					 
					
						2010-08-13 13:55:33 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								edison su 
							
						 
					 
					
						
						
						
						
							
						
						
							59912c09c9 
							
						 
					 
					
						
						
							
							Remove the VHD template signature check when downdloading template.  
						
						 
						
						... 
						
						
						
						There are lots tools can create VHD disk: xenserver, xenconverter, hyper-v, platespin, etc. And some tools didn't create a correct signature. 
						
						
					 
					
						2010-08-13 12:09:50 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Manuel Amador (Rudd-O) 
							
						 
					 
					
						
						
						
						
							
						
						
							3acc84282f 
							
						 
					 
					
						
						
							
							cannot use hardlink when we are using symlink  
						
						 
						
						
						
						
					 
					
						2010-08-13 01:01:50 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Manuel Amador (Rudd-O) 
							
						 
					 
					
						
						
						
						
							
						
						
							5a1fb90360 
							
						 
					 
					
						
						
							
							Performance and assurement improvements in wscript  
						
						 
						
						
						
						
					 
					
						2010-08-13 00:36:21 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Manuel Amador (Rudd-O) 
							
						 
					 
					
						
						
						
						
							
						
						
							eef9b7722a 
							
						 
					 
					
						
						
							
							Do not remove the build tree after build  
						
						 
						
						
						
						
					 
					
						2010-08-13 00:28:03 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								edison su 
							
						 
					 
					
						
						
						
						
							
						
						
							d5b9f6a8c4 
							
						 
					 
					
						
						
							
							Make the VHD file created by xenconverter importable.  
						
						 
						
						
						
						
					 
					
						2010-08-12 19:50:14 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								unknown 
							
						 
					 
					
						
						
						
						
							
						
						
							30c5352f20 
							
						 
					 
					
						
						
							
							- dos2unix deploy-db-dev.sh  
						
						 
						
						
						
						
					 
					
						2010-08-12 17:19:30 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Manuel Amador (Rudd-O) 
							
						 
					 
					
						
						
						
						
							
						
						
							c928ec47f7 
							
						 
					 
					
						
						
							
							Added new .gitignore from master  
						
						 
						
						
						
						
					 
					
						2010-08-12 16:52:58 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							3268303d51 
							
						 
					 
					
						
						
							
							Merge branch '2.1.refactor' of ssh://git.cloud.com/var/lib/git/cloudstack-oss into 2.1.refactor  
						
						 
						
						
						
						
					 
					
						2010-08-12 16:34:51 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Manuel Amador (Rudd-O) 
							
						 
					 
					
						
						
						
						
							
						
						
							09f362b364 
							
						 
					 
					
						
						
							
							Git ignore updated with changes from 2.1.x  
						
						 
						
						
						
						
					 
					
						2010-08-12 16:34:39 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							167433e562 
							
						 
					 
					
						
						
							
							Api refactor:  
						
						 
						
						... 
						
						
						
						* Moved ManagementServer interface from "core" to "server" package
* Changed AddConfig, UpdateCfg, UpdateAccount commands 
						
						
					 
					
						2010-08-12 16:32:23 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								abhishek 
							
						 
					 
					
						
						
						
						
							
						
						
							3f8dc05600 
							
						 
					 
					
						
						
							
							Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss  
						
						 
						
						
						
						
					 
					
						2010-08-12 15:53:06 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								abhishek 
							
						 
					 
					
						
						
						
						
							
						
						
							d8cc85c42f 
							
						 
					 
					
						
						
							
							Fixing the listAlerts api call to return the correct format for the sent on field  
						
						 
						
						
						
						
					 
					
						2010-08-12 15:52:34 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Manuel Amador (Rudd-O) 
							
						 
					 
					
						
						
						
						
							
						
						
							a2cf253b20 
							
						 
					 
					
						
						
							
							bug 5876: Fix error reporting in agent setup so it will not cause a nested exception  
						
						 
						
						... 
						
						
						
						The function stderr was being called with the wrong name of interpolation parameters.  The exception was missing from the arguments to the function.
status 5876: resolved fixed 
						
						
					 
					
						2010-08-12 15:22:34 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Manuel Amador (Rudd-O) 
							
						 
					 
					
						
						
						
						
							
						
						
							b97899b2cf 
							
						 
					 
					
						
						
							
							Correct indentationerror in python  
						
						 
						
						
						
						
					 
					
						2010-08-12 15:21:51 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Manuel Amador (Rudd-O) 
							
						 
					 
					
						
						
						
						
							
						
						
							69ee28e6c9 
							
						 
					 
					
						
						
							
							Add support for installing any type of file within client/WEB-INF  
						
						 
						
						
						
						
					 
					
						2010-08-12 15:08:40 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								abhishek 
							
						 
					 
					
						
						
						
						
							
						
						
							b5a6d81ffe 
							
						 
					 
					
						
						
							
							Forgot to check this part in, for the UpgradeVmCmd  
						
						 
						
						
						
						
					 
					
						2010-08-12 14:28:24 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								abhishek 
							
						 
					 
					
						
						
						
						
							
						
						
							5a0735edd6 
							
						 
					 
					
						
						
							
							Refactoring upgradeVmCmd (note that the response obj still needs to be constructed)  
						
						 
						
						
						
						
					 
					
						2010-08-12 14:22:30 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jessica 
							
						 
					 
					
						
						
						
						
							
						
						
							87b16702fe 
							
						 
					 
					
						
						
							
							Test author settings in Tortoise Git  
						
						 
						
						
						
						
					 
					
						2010-08-12 11:57:38 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								unknown 
							
						 
					 
					
						
						
						
						
							
						
						
							a0c300f0a3 
							
						 
					 
					
						
						
							
							Git check-in test  
						
						 
						
						
						
						
					 
					
						2010-08-12 11:52:46 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								unknown 
							
						 
					 
					
						
						
						
						
							
						
						
							be793dc8a4 
							
						 
					 
					
						
						
							
							temporarily remove localization stuff until Manuel fixs waf build.  
						
						 
						
						
						
						
					 
					
						2010-08-12 11:48:49 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jessica 
							
						 
					 
					
						
						
						
						
							
						
						
							c923149205 
							
						 
					 
					
						
						
							
							temporarily remove localization stuff until Manuel fixs waf build.  
						
						 
						
						
						
						
					 
					
						2010-08-12 11:46:22 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							8825147f0d 
							
						 
					 
					
						
						
							
							Merge branch '2.1.refactor' of ssh://git.cloud.com/var/lib/git/cloudstack-oss into 2.1.refactor  
						
						 
						
						... 
						
						
						
						Conflicts:
	server/src/com/cloud/configuration/ConfigurationManager.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java 
						
						
					 
					
						2010-08-12 11:41:02 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							a9d48a1b8a 
							
						 
					 
					
						
						
							
							Refactored updateDiskOffering and deleteDiskOffering commands  
						
						 
						
						
						
						
					 
					
						2010-08-12 11:27:37 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kelven 
							
						 
					 
					
						
						
						
						
							
						
						
							64221eff7b 
							
						 
					 
					
						
						
							
							Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss  
						
						 
						
						
						
						
					 
					
						2010-08-12 11:07:19 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								abhishek 
							
						 
					 
					
						
						
						
						
							
						
						
							23444d5f07 
							
						 
					 
					
						
						
							
							Refactoring the updateZone command  
						
						 
						
						
						
						
					 
					
						2010-08-12 10:59:59 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							c3c5f7fa7c 
							
						 
					 
					
						
						
							
							Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss  
						
						 
						
						
						
						
					 
					
						2010-08-11 22:14:55 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							7f40fe0e07 
							
						 
					 
					
						
						
							
							not overwritten  
						
						 
						
						
						
						
					 
					
						2010-08-11 22:14:44 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							066f24dd4e 
							
						 
					 
					
						
						
							
							Changed the version number to use the date time.  This way developer can still figure out which file they should look at.  
						
						 
						
						
						
						
					 
					
						2010-08-11 22:13:53 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								edison 
							
						 
					 
					
						
						
						
						
							
						
						
							9963ec0a46 
							
						 
					 
					
						
						
							
							Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss  
						
						 
						
						
						
						
					 
					
						2010-08-11 19:33:44 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kris McQueen 
							
						 
					 
					
						
						
						
						
							
						
						
							96f76062f9 
							
						 
					 
					
						
						
							
							Moving createDiskOffering to configurationManager, make AssignToLoadBalancer async  
						
						 
						
						
						
						
					 
					
						2010-08-11 19:32:09 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								edison 
							
						 
					 
					
						
						
						
						
							
						
						
							dc005b9b9c 
							
						 
					 
					
						
						
							
							add setup_agent.sh, the first script running during add host  
						
						 
						
						... 
						
						
						
						Make cloud-setup-agent/console-proxy in unattended mode 
						
						
					 
					
						2010-08-11 19:31:07 -07:00