Mice Xia 
							
						 
					 
					
						
						
						
						
							
						
						
							a5bca0999a 
							
						 
					 
					
						
						
							
							CLOUDSTACK-118 Status of host resorce stuck in ErrorInMaintenance  
						
						 
						
						
						
						
					 
					
						2012-10-08 14:05:05 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							436960d2aa 
							
						 
					 
					
						
						
							
							Fixed unittest  
						
						 
						
						
						
						
					 
					
						2012-10-05 15:38:20 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							fa81f27254 
							
						 
					 
					
						
						
							
							CLOUDSTACK-271: when check for vnet conflicts against existing physical networks, skip the networks with null vnet ranges  
						
						 
						
						
						
						
					 
					
						2012-10-05 15:10:31 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							be2017849a 
							
						 
					 
					
						
						
							
							CLOUDSTACK-84: fixed NPE that used to happen on API layer when list resource of the project was called when project was going through removal process.  
						
						 
						
						
						
						
					 
					
						2012-10-05 15:10:31 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							5cd7fb8408 
							
						 
					 
					
						
						
							
							CLOUDSTACK-121: Fixed "Incorrect username/domainId login causes NullPointerException "  
						
						 
						
						
						
						
					 
					
						2012-10-05 11:42:04 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Anthony Xu 
							
						 
					 
					
						
						
						
						
							
						
						
							15f6fbbee4 
							
						 
					 
					
						
						
							
							CLOUDSTACK-251 :  
						
						 
						
						... 
						
						
						
						when host is reconnected, CS try to make sure the host can access primary storage,
CS only do this when primary storage is UP, and even host cannot access primary storage,
that is okay, do not throw exception, just print a warning message 
						
						
					 
					
						2012-10-04 11:31:53 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Murali Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							4e1f3f9410 
							
						 
					 
					
						
						
							
							CS-16426 For network offerings with IP conserved mode off, LB/PF/StaticNAT rule creation fails if the first rule is firewall  
						
						 
						
						... 
						
						
						
						fixes, accidental modification of network services map object corresponding to a public IP 
						
						
					 
					
						2012-10-03 17:18:00 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							78c08de467 
							
						 
					 
					
						
						
							
							Removed unused imports (that caused a dependency on xapi)  
						
						 
						
						
						
						
					 
					
						2012-10-02 10:30:26 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chip Childers 
							
						 
					 
					
						
						
						
						
							
						
						
							b7a93be47e 
							
						 
					 
					
						
						
							
							Added license header to Upgrade40to41.java  
						
						 
						
						
						
						
					 
					
						2012-10-02 13:06:59 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							f16b5103d8 
							
						 
					 
					
						
						
							
							Merge some stuff from maven-waf branch into master  
						
						 
						
						
						
						
					 
					
						2012-10-01 15:04:08 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							93aaa5f975 
							
						 
					 
					
						
						
							
							Provide an (for now) empty upgrade path so the server will start.  
						
						 
						
						
						
						
					 
					
						2012-10-01 14:07:24 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							aa6355ffe6 
							
						 
					 
					
						
						
							
							Updated master to 4.1.0  
						
						 
						
						... 
						
						
						
						mvn release:update-versions -DautoVersionSubmodules=true -Dnonoss -P
client,deps,developer  -DdevelopmentVersion=4.1.0-SNAPSHOT 
						
						
					 
					
						2012-10-01 11:00:55 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							11fe086ada 
							
						 
					 
					
						
						
							
							Fixing CLOUDSTACK-226: don't allow physical networks with overlaping vnet ranges, belong to the same zone. Fixed create and update physical network code  
						
						 
						
						
						
						
					 
					
						2012-09-28 13:11:20 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							dc64fcab93 
							
						 
					 
					
						
						
							
							Removed unused code that was commented out in SnapshotManagerImpl- you can alway retrieve it back from the history if needed  
						
						 
						
						... 
						
						
						
						Conflicts:
	server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java 
						
						
					 
					
						2012-09-27 11:13:37 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							efab2f413b 
							
						 
					 
					
						
						
							
							Removed more unused imports in Snapshots code  
						
						 
						
						... 
						
						
						
						Conflicts:
	server/src/com/cloud/storage/dao/SnapshotScheduleDao.java
	server/src/com/cloud/storage/snapshot/SnapshotSchedulerImpl.java 
						
						
					 
					
						2012-09-27 11:12:53 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							c27b44e7f7 
							
						 
					 
					
						
						
							
							Removed unused imports from snapshot manager  
						
						 
						
						
						
						
					 
					
						2012-09-27 10:50:48 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							6875f48966 
							
						 
					 
					
						
						
							
							Validate port ranges in PF rule only when startPort != endPort in private or public range  
						
						 
						
						
						
						
					 
					
						2012-09-27 10:50:30 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							bbbccc0a7b 
							
						 
					 
					
						
						
							
							Port ranges for PF rules: public port start should be equal to ending port start; the same applies to end ports  
						
						 
						
						
						
						
					 
					
						2012-09-27 10:50:04 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mice Xia 
							
						 
					 
					
						
						
						
						
							
						
						
							daeac9ec57 
							
						 
					 
					
						
						
							
							CLOUDSTACK-215 CPVM load balance didn't work, VNC console sessions go to one CPVM and ignore other CPVMs  
						
						 
						
						
						
						
					 
					
						2012-09-27 13:03:09 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Marcus Sorensen 
							
						 
					 
					
						
						
						
						
							
						
						
							3c25d0ea67 
							
						 
					 
					
						
						
							
							CLOUDSTACK-202 Can't create VM from ISO, when in VPC  
						
						 
						
						... 
						
						
						
						Signed-off-by: Mice Xia <mice_xia@tcloudcomputing.com> 
						
						
					 
					
						2012-09-27 10:07:15 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kishan Kavala 
							
						 
					 
					
						
						
						
						
							
						
						
							6540ff8fa1 
							
						 
					 
					
						
						
							
							bug CLOUDSTACK-198: VPN user add, on failure remove user currently being added only, other users will remain in Add state  
						
						 
						
						
						
						
					 
					
						2012-09-26 13:54:49 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mice Xia 
							
						 
					 
					
						
						
						
						
							
						
						
							2da5b448a1 
							
						 
					 
					
						
						
							
							CLOUDSTACK-204 Setting global config 'consoleproxy.service.offering' causes mgmt failed to start (add exception handling)  
						
						 
						
						
						
						
					 
					
						2012-09-26 14:51:17 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mice Xia 
							
						 
					 
					
						
						
						
						
							
						
						
							7e75140537 
							
						 
					 
					
						
						
							
							CLOUDSTACK-204 Setting global config 'consoleproxy.service.offering' causes mgmt failed to start  
						
						 
						
						
						
						
					 
					
						2012-09-26 14:05:37 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							51041e4f77 
							
						 
					 
					
						
						
							
							Fixed security problem in listAccounts call (regular user could see other accounts' info when domainId was passed in to listAccounts call)  
						
						 
						
						
						
						
					 
					
						2012-09-25 10:44:22 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							a82ee7715e 
							
						 
					 
					
						
						
							
							CLOUDSTACK-191: Update checking for updateCustomerGateway  
						
						 
						
						... 
						
						
						
						Reviewed-by: Anthony Xu
Conflicts:
	server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java 
						
						
					 
					
						2012-09-24 17:47:09 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							a01304e65b 
							
						 
					 
					
						
						
							
							CLOUDSTACK-123: fix NPE  
						
						 
						
						
						
						
					 
					
						2012-09-18 16:43:05 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mice Xia 
							
						 
					 
					
						
						
						
						
							
						
						
							955cbd97bc 
							
						 
					 
					
						
						
							
							CLOUDSTACK-10 Deleting a disconnected primary storage results in partial removed state  
						
						 
						
						
						
						
					 
					
						2012-09-18 11:18:44 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mice Xia 
							
						 
					 
					
						
						
						
						
							
						
						
							16c1fd9288 
							
						 
					 
					
						
						
							
							CLOUDSTACK-116 Guest Network created in a Sub Domain which doesn't have a network domain suffix, is assigned the network domain suffix of the zone instead of that of the Parent domain of the Sub domain  
						
						 
						
						
						
						
					 
					
						2012-09-17 21:23:41 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Murali Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							ff81fda4e0 
							
						 
					 
					
						
						
							
							adding missing import that should have been part of commit b28749f2b13df40693546578047bb6000180ab0d  
						
						 
						
						
						
						
					 
					
						2012-09-17 13:18:32 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Murali Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							b28749f2b1 
							
						 
					 
					
						
						
							
							upgrade external devices support from 2.2.14 to network offering framework  
						
						 
						
						
						
						
					 
					
						2012-09-17 11:39:41 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Manikanta Kattamuri 
							
						 
					 
					
						
						
						
						
							
						
						
							cfc2b85651 
							
						 
					 
					
						
						
							
							Removing eclipse .classpath and .project files as they are configured to ant build and adding the entries into .gitignore to stop further comitting of the files  
						
						 
						
						... 
						
						
						
						Signed-off-by: Chip Childers <chip.childers@gmail.com> 
						
						
					 
					
						2012-09-13 14:18:14 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Koushik Das 
							
						 
					 
					
						
						
						
						
							
						
						
							a9559cbb67 
							
						 
					 
					
						
						
							
							When a VM is force deleted and the host is not available then CS simply marks the state in db as "Destroyed/Expunging". The VM is still running on the host and once it becomes available again there is a discrepancy in state of the VM. In this scenario the VM is removed from the host when the next full cluster sync happens.  
						
						 
						
						
						
						
					 
					
						2012-09-13 16:34:53 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mice Xia 
							
						 
					 
					
						
						
						
						
							
						
						
							5532f58bbc 
							
						 
					 
					
						
						
							
							remove cloud.com license headers  
						
						 
						
						
						
						
					 
					
						2012-09-13 12:34:32 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mice Xia 
							
						 
					 
					
						
						
						
						
							
						
						
							55bcfaf805 
							
						 
					 
					
						
						
							
							CLOUDSTACK-88  Cannot listVM by vpcId which is required by VPC UI  
						
						 
						
						
						
						
					 
					
						2012-09-13 11:21:11 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							fe8a2992a2 
							
						 
					 
					
						
						
							
							Elimiate mystery guestIp in IpAddressTO  
						
						 
						
						... 
						
						
						
						Nobody can explain why it's there...
Also fix wrong return result of several empty network element callbacks 
						
						
					 
					
						2012-09-12 15:42:48 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Saksham Srivastava 
							
						 
					 
					
						
						
						
						
							
						
						
							a56631bc66 
							
						 
					 
					
						
						
							
							bug CS-15278: Added global setting login.attempts.allowed which defines the maximum incorrect password attempts allowed.  
						
						 
						
						... 
						
						
						
						Also after the maximum attempts are reached the user account is disabled 
						
						
					 
					
						2012-09-12 19:35:24 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prasanna Santhanam 
							
						 
					 
					
						
						
						
						
							
						
						
							cd77e42a71 
							
						 
					 
					
						
						
							
							Closing open transactions from SecurityGroupWorkDao  
						
						 
						
						... 
						
						
						
						reviewed-by : Prachi Damle 
						
						
					 
					
						2012-09-12 18:48:33 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							c876a66b3f 
							
						 
					 
					
						
						
							
							Fixed unittest  
						
						 
						
						
						
						
					 
					
						2012-09-11 17:26:20 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							f5c9397327 
							
						 
					 
					
						
						
							
							CS-16187: don't allow vpc offering creation with unsupported services (Firewall, SecurityGroup)  
						
						 
						
						... 
						
						
						
						Conflicts:
	server/src/com/cloud/network/vpc/VpcManagerImpl.java 
						
						
					 
					
						2012-09-11 17:05:04 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							d0c526fdcd 
							
						 
					 
					
						
						
							
							Replaced tabs with spaces in VirtualNetworkApplianceManagerImpl (tabs were used mostly in network stats related code)  
						
						 
						
						
						
						
					 
					
						2012-09-11 17:03:11 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Fang Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							6fd7da8f56 
							
						 
					 
					
						
						
							
							Keep the instance-id and vm-id values prior to Acton, use UUID for VMs created poast Acton.  
						
						 
						
						
						
						
					 
					
						2012-09-11 17:03:11 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Likitha Shetty 
							
						 
					 
					
						
						
						
						
							
						
						
							cc80d09d77 
							
						 
					 
					
						
						
							
							CS-14796: Error out with InvalidParameterValueException in UserVmManagerImpl if userdata is not base64 encoded.  
						
						 
						
						
						
						
					 
					
						2012-09-11 16:58:09 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							acd08e61e6 
							
						 
					 
					
						
						
							
							CS-16239: don't try to pull key information if the key was removed in the system  
						
						 
						
						... 
						
						
						
						As a part of the commit, also checking deleteSshKeyPair name - admin was unable to delete the key on behalf of another user
Conflicts:
	server/src/com/cloud/api/ApiDBUtils.java 
						
						
					 
					
						2012-09-11 14:37:25 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Koushik Das 
							
						 
					 
					
						
						
						
						
							
						
						
							65eeeaf071 
							
						 
					 
					
						
						
							
							CS-14277  
						
						 
						
						... 
						
						
						
						Support for local data disk. Currently enable/disable config is at zone level, in subsequent checkins it can be made more granular.
    Following changes are made:
    - Create disk offering API now takes an extra parameter to denote storage type (local or shared). This is similar to storage type in service offering.
    - Create/delete of data volume on local storage
    - Attach/detach for local data volumes. Re-attach is allowed as long as vm host and data volume storage pool host is same.
    - Migration of VM instance is not supported if it uses local root or data volumes.
    - Migrate is not supported for local volumes.
    - Zone level config to enable/disable local storage usage for service and disk offerings.
    - Local storage gets discovered when a host is added/reconnected if zone level config is enabled. When disabled existing local storages are not removed but any new local storage is not added.
    - Deploy VM command validates service and disk offerings based on local storage config.
    - Upgrade uses the global config 'use.local.storage' to set the zone level config for local storage.
(cherry picked from commit 62710aed37606168012a0ed255a876c8e7954010) 
						
						
					 
					
						2012-09-11 17:22:43 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Fang Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							4b8fb79ef6 
							
						 
					 
					
						
						
							
							Fix the output of instance-id and vm-id to UUID  
						
						 
						
						
						
						
					 
					
						2012-09-10 18:02:34 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Fang Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							663e250334 
							
						 
					 
					
						
						
							
							Replace db-id by UUID for user VM's vm-id.  
						
						 
						
						
						
						
					 
					
						2012-09-10 18:01:08 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							d6b6529951 
							
						 
					 
					
						
						
							
							Revert "CLOUDSTACK-70: Improve Network Restart Behaviour for Basic Zone: Restarting Network Fails"  
						
						 
						
						... 
						
						
						
						This reverts commit ecd1ac214c34007214557c4191a803a55ded29f5. 
						
						
					 
					
						2012-09-10 16:34:21 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Anthony Xu 
							
						 
					 
					
						
						
						
						
							
						
						
							0442917381 
							
						 
					 
					
						
						
							
							only check ISO which is downloaded status  
						
						 
						
						
						
						
					 
					
						2012-09-10 13:30:25 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							ecd1ac214c 
							
						 
					 
					
						
						
							
							CLOUDSTACK-70: Improve Network Restart Behaviour for Basic Zone: Restarting Network Fails  
						
						 
						
						... 
						
						
						
						If cleanup=true, removes all VRs and creates VR, implements network.
If cleanup=false, skips running VRs, implements network for stopped/deleted VRs.
Signed-off-by: Rohit Yadav <rohit.yadav@citrix.com> 
						
						
					 
					
						2012-09-10 14:13:24 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							24fa14845b 
							
						 
					 
					
						
						
							
							Add KVM to hypervisor types allowed in VPC  
						
						 
						
						... 
						
						
						
						RB: https://reviews.apache.org/r/6926/ 
Send-by: Marcus Sorensen 
						
						
					 
					
						2012-09-07 15:39:23 -07:00