abhishek 
							
						 
					 
					
						
						
						
						
							
						
						
							efa8d2af07 
							
						 
					 
					
						
						
							
							bug 6188: fix for the issue  
						
						... 
						
						
						
						status 6188: resolved fixed 
						
						
					 
					
						2010-09-14 15:33:48 -07:00 
						 
				 
			
				
					
						
							
							
								abhishek 
							
						 
					 
					
						
						
						
						
							
						
						
							a178a9a675 
							
						 
					 
					
						
						
							
							import cleanup  
						
						
						
						
					 
					
						2010-09-14 11:38:41 -07:00 
						 
				 
			
				
					
						
							
							
								abhishek 
							
						 
					 
					
						
						
						
						
							
						
						
							dea01d0752 
							
						 
					 
					
						
						
							
							adding the status value whilst creating a storage pool using database config  
						
						
						
						
					 
					
						2010-09-14 11:37:32 -07:00 
						 
				 
			
				
					
						
							
							
								abhishek 
							
						 
					 
					
						
						
						
						
							
						
						
							91813371b4 
							
						 
					 
					
						
						
							
							further comments added  
						
						
						
						
					 
					
						2010-09-14 10:53:27 -07:00 
						 
				 
			
				
					
						
							
							
								abhishek 
							
						 
					 
					
						
						
						
						
							
						
						
							edc85dd12d 
							
						 
					 
					
						
						
							
							bug 6163: waiting on Alex to give me the go ahead for this bug, commenting out some of the code till then  
						
						
						
						
					 
					
						2010-09-14 10:52:04 -07:00 
						 
				 
			
				
					
						
							
							
								abhishek 
							
						 
					 
					
						
						
						
						
							
						
						
							ab166071f8 
							
						 
					 
					
						
						
							
							bug 6163: refactoring some more code  
						
						
						
						
					 
					
						2010-09-14 10:05:05 -07:00 
						 
				 
			
				
					
						
							
							
								abhishek 
							
						 
					 
					
						
						
						
						
							
						
						
							743187a951 
							
						 
					 
					
						
						
							
							bug 6163: implementing the search function for zone wide searches for vlans  
						
						
						
						
					 
					
						2010-09-14 10:05:05 -07:00 
						 
				 
			
				
					
						
							
							
								nit 
							
						 
					 
					
						
						
						
						
							
						
						
							8f955c2889 
							
						 
					 
					
						
						
							
							Fixing the ConcurrentModificationException  
						
						
						
						
					 
					
						2010-09-14 20:18:51 +05:30 
						 
				 
			
				
					
						
							
							
								abhishek 
							
						 
					 
					
						
						
						
						
							
						
						
							a03cf45e5d 
							
						 
					 
					
						
						
							
							further improvements to the sp code, especially for the local storage case  
						
						
						
						
					 
					
						2010-09-13 12:00:54 -07:00 
						 
				 
			
				
					
						
							
							
								abhishek 
							
						 
					 
					
						
						
						
						
							
						
						
							1af28db9cd 
							
						 
					 
					
						
						
							
							bug 6159: now we can add at most 2 records per public port (one for tcp, one for udp) eg: 1:2:tcp and 1:3:udp; any other combination for this port will result in an error being propagated back to the UI  
						
						... 
						
						
						
						status 6159: resolved fixed 
						
						
					 
					
						2010-09-13 10:19:02 -07:00 
						 
				 
			
				
					
						
							
							
								abhishek 
							
						 
					 
					
						
						
						
						
							
						
						
							542230fc26 
							
						 
					 
					
						
						
							
							null check for the npe  
						
						
						
						
					 
					
						2010-09-13 09:35:28 -07:00 
						 
				 
			
				
					
						
							
							
								abhishek 
							
						 
					 
					
						
						
						
						
							
						
						
							f82e73b861 
							
						 
					 
					
						
						
							
							bug 6159: incremental checkin  
						
						
						
						
					 
					
						2010-09-13 09:31:36 -07:00 
						 
				 
			
				
					
						
							
							
								edison 
							
						 
					 
					
						
						
						
						
							
						
						
							d933f19d35 
							
						 
					 
					
						
						
							
							bug 5800: add cluster for KVM  
						
						... 
						
						
						
						TODO: need to make sure the host cpu is from the same vender in a cluster 
						
						
					 
					
						2010-09-10 16:00:36 -07:00 
						 
				 
			
				
					
						
							
							
								abhishek 
							
						 
					 
					
						
						
						
						
							
						
						
							ec01e0b423 
							
						 
					 
					
						
						
							
							bug 5147: this checkin ensures that we cover some more corner cases, in particular, to not allow an execution when we have pools in inconsistent states (maintenance, prepareformaintenance or errorinmaintenance)  
						
						
						
						
					 
					
						2010-09-10 14:52:05 -07:00 
						 
				 
			
				
					
						
							
							
								abhishek 
							
						 
					 
					
						
						
						
						
							
						
						
							4682b25cb5 
							
						 
					 
					
						
						
							
							bug 5147: implemented the logic to ensure that the volume creation is blocked when all sp's are in maintenance (or any of the status != UP)  
						
						
						
						
					 
					
						2010-09-10 14:41:04 -07:00 
						 
				 
			
				
					
						
							
							
								abhishek 
							
						 
					 
					
						
						
						
						
							
						
						
							93261c4eb8 
							
						 
					 
					
						
						
							
							bug 5147: Improvements after testing the storage maintenance across multiple sp's, with sys vms scattered across multiple sps  
						
						
						
						
					 
					
						2010-09-10 13:44:39 -07:00 
						 
				 
			
				
					
						
							
							
								abhishek 
							
						 
					 
					
						
						
						
						
							
						
						
							8d38e230a5 
							
						 
					 
					
						
						
							
							bug 5147: we ensure that if the sp under maintenance is the only one in the cluster, we just stop the vms with no migration (base case)  
						
						
						
						
					 
					
						2010-09-09 18:34:44 -07:00 
						 
				 
			
				
					
						
							
							
								abhishek 
							
						 
					 
					
						
						
						
						
							
						
						
							0a4532a003 
							
						 
					 
					
						
						
							
							bug 5147: some more improvements  
						
						
						
						
					 
					
						2010-09-09 18:05:43 -07:00 
						 
				 
			
				
					
						
							
							
								abhishek 
							
						 
					 
					
						
						
						
						
							
						
						
							20973d48af 
							
						 
					 
					
						
						
							
							bug 5147: implementing the recommendations i got for the ps maintenance. For now, we are not implementing the cancel maintenance part. Instead, we are going to ask the admin if he is "sure" of enabling maintenance on a sp, before proceeding  
						
						
						
						
					 
					
						2010-09-09 18:05:43 -07:00 
						 
				 
			
				
					
						
							
							
								root 
							
						 
					 
					
						
						
						
						
							
						
						
							76e5cf3321 
							
						 
					 
					
						
						
							
							renamed dao methods to correctly reflect what they do  
						
						
						
						
					 
					
						2010-09-09 18:01:50 -07:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							dc4c4549d0 
							
						 
					 
					
						
						
							
							Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss  
						
						
						
						
					 
					
						2010-09-09 17:49:27 -07:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							994afb0e29 
							
						 
					 
					
						
						
							
							switched from networkprofile to network configuration  
						
						
						
						
					 
					
						2010-09-09 17:49:19 -07:00 
						 
				 
			
				
					
						
							
							
								root 
							
						 
					 
					
						
						
						
						
							
						
						
							077690cf15 
							
						 
					 
					
						
						
							
							switched from networkprofile to network configuration  
						
						
						
						
					 
					
						2010-09-09 17:48:24 -07:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							7f991f7e25 
							
						 
					 
					
						
						
							
							In hostAllocator, input clusterId instead of storagepool  
						
						
						
						
					 
					
						2010-09-09 17:08:08 -07:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							bce314b131 
							
						 
					 
					
						
						
							
							fixed a bug about snapshot  
						
						
						
						
					 
					
						2010-09-09 15:11:34 -07:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							5d185ad82f 
							
						 
					 
					
						
						
							
							removed network profile creation  
						
						
						
						
					 
					
						2010-09-09 14:45:16 -07:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							599f05d0da 
							
						 
					 
					
						
						
							
							missing files  
						
						
						
						
					 
					
						2010-09-09 13:37:57 -07:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							7249f168d5 
							
						 
					 
					
						
						
							
							more file changes  
						
						
						
						
					 
					
						2010-09-09 13:27:20 -07:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							6134f7dfd2 
							
						 
					 
					
						
						
							
							more file changes  
						
						
						
						
					 
					
						2010-09-09 11:52:12 -07:00 
						 
				 
			
				
					
						
							
							
								Manuel Amador (Rudd-O) 
							
						 
					 
					
						
						
						
						
							
						
						
							b0acdbcf8b 
							
						 
					 
					
						
						
							
							Split out build responsibility into per-project wscript_build files.  Installation of generic directories like bindir, and creation of systemvms, remain in toplevel wscript_build.  Make some waf code useful and reusable in the form of tools.  
						
						
						
						
					 
					
						2010-08-31 20:40:17 -07:00 
						 
				 
			
				
					
						
							
							
								edison 
							
						 
					 
					
						
						
						
						
							
						
						
							11fb89ac87 
							
						 
					 
					
						
						
							
							Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss  
						
						
						
						
					 
					
						2010-08-31 19:46:18 -07:00 
						 
				 
			
				
					
						
							
							
								edison 
							
						 
					 
					
						
						
						
						
							
						
						
							ea2828ee03 
							
						 
					 
					
						
						
							
							fix adding host bugs  
						
						
						
						
					 
					
						2010-08-31 19:46:03 -07:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							c65175aa40 
							
						 
					 
					
						
						
							
							bug 6048: Check createvolume's return  
						
						... 
						
						
						
						status 6048: resolved fixed 
						
						
					 
					
						2010-08-31 13:05:42 -07:00 
						 
				 
			
				
					
						
							
							
								abhishek 
							
						 
					 
					
						
						
						
						
							
						
						
							854611e40a 
							
						 
					 
					
						
						
							
							bug 5897: returning the os_type_id  
						
						... 
						
						
						
						status 5897: resolved fixed 
						
						
					 
					
						2010-08-30 16:25:58 -07:00 
						 
				 
			
				
					
						
							
							
								abhishek 
							
						 
					 
					
						
						
						
						
							
						
						
							1c87879e21 
							
						 
					 
					
						
						
							
							bug 4898: removing the upgrade.url param  
						
						... 
						
						
						
						status 4898: resolved fixed 
						
						
					 
					
						2010-08-30 14:49:22 -07:00 
						 
				 
			
				
					
						
							
							
								abhishek 
							
						 
					 
					
						
						
						
						
							
						
						
							992458e9d0 
							
						 
					 
					
						
						
							
							bug 5843: Merging in the fix  
						
						... 
						
						
						
						status 5843: resolved fixed 
						
						
					 
					
						2010-08-30 13:45:22 -07:00 
						 
				 
			
				
					
						
							
							
								abhishek 
							
						 
					 
					
						
						
						
						
							
						
						
							64210bd16d 
							
						 
					 
					
						
						
							
							bug 6010: Fixing the list volumes issue, now we filter volumes based on the template type and not based on the names  
						
						... 
						
						
						
						status 6010: resolved fixed 
						
						
					 
					
						2010-08-30 11:18:43 -07:00 
						 
				 
			
				
					
						
							
							
								abhishek 
							
						 
					 
					
						
						
						
						
							
						
						
							7a0ad69b89 
							
						 
					 
					
						
						
							
							Incremental checkin  
						
						
						
						
					 
					
						2010-08-30 10:40:45 -07:00 
						 
				 
			
				
					
						
							
							
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							7eb61b705a 
							
						 
					 
					
						
						
							
							Allow NetworkManagerImpl and SecondaryStorageImpl to tolerate missing of system vm template at startup  
						
						
						
						
					 
					
						2010-08-27 16:32:03 -07:00 
						 
				 
			
				
					
						
							
							
								kishan 
							
						 
					 
					
						
						
						
						
							
						
						
							0e326e853c 
							
						 
					 
					
						
						
							
							bug 5900: Added events for disk offering  
						
						
						
						
					 
					
						2010-08-27 18:02:23 +05:30 
						 
				 
			
				
					
						
							
							
								Anthony Xu 
							
						 
					 
					
						
						
						
						
							
						
						
							8a928a7a30 
							
						 
					 
					
						
						
							
							Merge branch 'master' of ssh://anthony@git.cloud.com/var/lib/git/cloudstack-oss  
						
						
						
						
					 
					
						2010-08-26 16:06:57 -07:00 
						 
				 
			
				
					
						
							
							
								Anthony Xu 
							
						 
					 
					
						
						
						
						
							
						
						
							d72e0538da 
							
						 
					 
					
						
						
							
							Revert "Revert "use iso to patch systemvm""  
						
						... 
						
						
						
						This reverts commit 145e2e0aaa9b57286102664787e8e40ad3d75e26. 
						
						
					 
					
						2010-08-26 16:06:28 -07:00 
						 
				 
			
				
					
						
							
							
								Anthony Xu 
							
						 
					 
					
						
						
						
						
							
						
						
							145e2e0aaa 
							
						 
					 
					
						
						
							
							Revert "use iso to patch systemvm"  
						
						... 
						
						
						
						This reverts commit 3565f8d21b331745b99ce3a09a35d642f2f7bcfe. 
						
						
					 
					
						2010-08-26 16:03:34 -07:00 
						 
				 
			
				
					
						
							
							
								root 
							
						 
					 
					
						
						
						
						
							
						
						
							3565f8d21b 
							
						 
					 
					
						
						
							
							use iso to patch systemvm  
						
						... 
						
						
						
						Conflicts:
	core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
	scripts/vm/hypervisor/xenserver/xenserver56/patch 
						
						
					 
					
						2010-08-26 15:56:02 -07:00 
						 
				 
			
				
					
						
							
							
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							b69816814c 
							
						 
					 
					
						
						
							
							Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss  
						
						
						
						
					 
					
						2010-08-26 13:56:23 -07:00 
						 
				 
			
				
					
						
							
							
								kishan 
							
						 
					 
					
						
						
						
						
							
						
						
							43169f3f96 
							
						 
					 
					
						
						
							
							bug 5895: added config param to turn on/off md5 hash  
						
						
						
						
					 
					
						2010-08-26 23:39:32 +05:30 
						 
				 
			
				
					
						
							
							
								kishan 
							
						 
					 
					
						
						
						
						
							
						
						
							fb99f95d7c 
							
						 
					 
					
						
						
							
							bug 5730: update dns of systemVms during zone update  
						
						
						
						
					 
					
						2010-08-26 21:02:37 +05:30 
						 
				 
			
				
					
						
							
							
								kishan 
							
						 
					 
					
						
						
						
						
							
						
						
							acb23b6158 
							
						 
					 
					
						
						
							
							bug 5904,5474: added listCapabilities API  
						
						
						
						
					 
					
						2010-08-26 14:53:03 +05:30 
						 
				 
			
				
					
						
							
							
								will 
							
						 
					 
					
						
						
						
						
							
						
						
							f8c93cd5fa 
							
						 
					 
					
						
						
							
							Bug #:5975  
						
						... 
						
						
						
						Merge from 2.1.x
- Fixed issue where listAccounts only return one less than the actual number of accounts in the system.  That is because the SQL query asks for X accounts, but the API filters out the SYSTEM account.  The fix is to add the filter of the system account in the actual query itself rather than have the code do it.
Conflicts:
	server/src/com/cloud/api/commands/ListAccountsCmd.java 
						
						
					 
					
						2010-08-25 18:21:32 -07:00 
						 
				 
			
				
					
						
							
							
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							23a38bc2be 
							
						 
					 
					
						
						
							
							Debug & Test template copy from secondary storage to primary stroage on vmware  
						
						
						
						
					 
					
						2010-08-25 18:17:20 -07:00