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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							60f130c509 
							
						 
					 
					
						
						
							
							CS-16258: Load Test - 1 host stuck in "Rebalancing" state forever. "java.lang.NullPointerException" seen in "Cluster-Worker" thread that was handling this process.  
						
						 
						
						... 
						
						
						
						- Using temp to not affect the return value for the method. 
						
						
					 
					
						2012-09-06 16:31:00 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							61a19eb089 
							
						 
					 
					
						
						
							
							CS-16022: If host connection fails due to some DB error, host disconnect does not happen and mgmt_server_id is not removed.  
						
						 
						
						... 
						
						
						
						Making sure host disconnect is called. 
						
						
					 
					
						2012-09-06 16:30:50 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							86427559cb 
							
						 
					 
					
						
						
							
							CS-16269: Fix savePassword on one stopped RvR  
						
						 
						
						
						
						
					 
					
						2012-09-05 13:46:44 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							51cc301fef 
							
						 
					 
					
						
						
							
							CS-16222: send password reset command only to the element responsible for the userdata service in network  
						
						 
						
						... 
						
						
						
						Reviewed-by: Sheng Yang 
						
						
					 
					
						2012-09-04 13:41:10 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							f509efe2d8 
							
						 
					 
					
						
						
							
							cloudstack 3.0 - API response serializer - change XML serialized string's encoding from ISO-8859-1 to UTF-8 to support more characters - fix "L10N: DE, ES, FR, JA, KO, SC: Garbage characters appear when using localized characters in Subscriptions page" (Reviewed-by: Brian)  
						
						 
						
						
						
						
					 
					
						2012-09-04 11:43:29 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mice Xia 
							
						 
					 
					
						
						
						
						
							
						
						
							dd07d1598f 
							
						 
					 
					
						
						
							
							Fix Bug CloudStack-9 can not change OS preference from OS to none  
						
						 
						
						
						
						
					 
					
						2012-09-04 20:51:03 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							083cef37f1 
							
						 
					 
					
						
						
							
							CS 16158: Load Test - Adding host takes much longer in 3.0.x compared to 2.2.14.  
						
						 
						
						... 
						
						
						
						Reviewed-By: Alena
Changes:
- Removing unnecessary search over op_host_capacity table in StorageCapacitylistener. 
						
						
					 
					
						2012-08-31 13:40:18 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							3d0069bb56 
							
						 
					 
					
						
						
							
							CS-16158 : Load Test - Adding host takes much longer in 3.0.x compared to 2.2.14.  
						
						 
						
						... 
						
						
						
						Changes:
There is an unnecessary search over capacity table that scans entire table. 
						
						
					 
					
						2012-08-31 13:40:17 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Gavin Lee 
							
						 
					 
					
						
						
						
						
							
						
						
							39a676c496 
							
						 
					 
					
						
						
							
							Correct license header mainly for patches folder  
						
						 
						
						... 
						
						
						
						Signed-off-by: Chip Childers <chip.childers@gmail.com>
I've assumed that Gavin's commit is appropriate, based
on an assumption that we will keep these files in the source
tree.  If https://issues.apache.org/jira/browse/LEGAL-146 
results in a different opionion from the members, then we
will end up having to do something more drastic anyway. 
						
						
					 
					
						2012-08-31 10:50:46 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Gavin Lee 
							
						 
					 
					
						
						
						
						
							
						
						
							d3921139ed 
							
						 
					 
					
						
						
							
							Patch from Gavin Lee: Change license to ASL2.0 in server and tools  
						
						 
						
						... 
						
						
						
						Signed-off-by: Chip Childers <chip.childers@gmail.com> 
						
						
					 
					
						2012-08-30 10:36:29 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Darren Shepherd 
							
						 
					 
					
						
						
						
						
							
						
						
							f7acd8fed8 
							
						 
					 
					
						
						
							
							Create random version for StartupCommands in dev env setup  
						
						 
						
						
						
						
					 
					
						2012-08-30 08:47:02 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							79ebffe4f3 
							
						 
					 
					
						
						
							
							CS-13594: Download template is unable to handle multiple SSVMs per zone  
						
						 
						
						... 
						
						
						
						Reviewed-by: Kishan 
						
						
					 
					
						2012-08-29 15:25:00 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jayapal 
							
						 
					 
					
						
						
						
						
							
						
						
							eb4a3cf6c8 
							
						 
					 
					
						
						
							
							bug CS-15398: fix for basic zone dns issue in multiple pods  
						
						 
						
						
						
						
					 
					
						2012-08-29 14:33:27 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								olivier lamy 
							
						 
					 
					
						
						
						
						
							
						
						
							f6f1be62b9 
							
						 
					 
					
						
						
							
							configuring tomcat maven plugin too  
						
						 
						
						
						
						
					 
					
						2012-08-28 23:58:06 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								olivier lamy 
							
						 
					 
					
						
						
						
						
							
						
						
							f218003607 
							
						 
					 
					
						
						
							
							Merge branch 'maven-final' of git://github.com/ibuildthecloud/incubator-cloudstack  
						
						 
						
						
						
						
					 
					
						2012-08-28 23:30:57 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Likitha Shetty 
							
						 
					 
					
						
						
						
						
							
						
						
							8c3450b503 
							
						 
					 
					
						
						
							
							CS-14770. ec2-run-instances and ec2-describe-instances don't return keypair information. Component: AWSAPI.  
						
						 
						
						
						
						
					 
					
						2012-08-28 13:52:42 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Darren Shepherd 
							
						 
					 
					
						
						
						
						
							
						
						
							ff7c964a66 
							
						 
					 
					
						
						
							
							Add ability to do jetty:run in eclipse  
						
						 
						
						
						
						
					 
					
						2012-08-28 09:16:44 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Darren Shepherd 
							
						 
					 
					
						
						
						
						
							
						
						
							43e4de429e 
							
						 
					 
					
						
						
							
							Fix up some dependencies  
						
						 
						
						
						
						
					 
					
						2012-08-28 09:03:25 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Abhinandan Prateek 
							
						 
					 
					
						
						
						
						
							
						
						
							5e0ede8bd9 
							
						 
					 
					
						
						
							
							bug 13946: reducing poll interval  
						
						 
						
						
						
						
					 
					
						2012-08-28 12:22:46 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							38e26f8dbd 
							
						 
					 
					
						
						
							
							IpAssoc: when set ROUTER_GUEST_IP, get network id from associatedNetworkId field of the ip address instead of networkId as networkId is the id of the public network the ip belongs to  
						
						 
						
						... 
						
						
						
						Reviewed-by: Sheng Yang 
						
						
					 
					
						2012-08-27 16:26:32 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							82cb1095dc 
							
						 
					 
					
						
						
							
							CS-16188: S2S VPN: Limit VPN customer gateway name duplicate checking within account  
						
						 
						
						... 
						
						
						
						Reviewed-by: Anthony Xu
Conflicts:
	server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java 
						
						
					 
					
						2012-08-27 16:11:36 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							fbdc7fc59f 
							
						 
					 
					
						
						
							
							CS-16178 - when remove PF rule, in VPC setup make sure if the rule is the last one for the network, disassociate it from the network  
						
						 
						
						... 
						
						
						
						Reviewed-by: Sheng Yang 
						
						
					 
					
						2012-08-27 13:46:36 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							48806fcc54 
							
						 
					 
					
						
						
							
							VPC: CS-16179 - only offerings in Enabled state can be used for VPC creation  
						
						 
						
						... 
						
						
						
						Reviewed-by: Frank Zhang
Conflicts:
	server/src/com/cloud/network/vpc/VpcManagerImpl.java 
						
						
					 
					
						2012-08-27 11:11:55 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							3609e44b58 
							
						 
					 
					
						
						
							
							commit for  https://reviews.apache.org/r/6608/  
						
						 
						
						
						
						
					 
					
						2012-08-27 10:39:49 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							93ac01db0b 
							
						 
					 
					
						
						
							
							Fixed unittest  
						
						 
						
						
						
						
					 
					
						2012-08-27 09:46:56 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								olivier lamy 
							
						 
					 
					
						
						
						
						
							
						
						
							a06ed5728c 
							
						 
					 
					
						
						
							
							remove intermediate parent poms  
						
						 
						
						
						
						
					 
					
						2012-08-27 16:43:24 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								olivier lamy 
							
						 
					 
					
						
						
						
						
							
						
						
							3aa469da2a 
							
						 
					 
					
						
						
							
							groupdId is now org.apache.cloudstack  
						
						 
						
						
						
						
					 
					
						2012-08-25 09:20:21 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								olivier lamy 
							
						 
					 
					
						
						
						
						
							
						
						
							0d9b81aac6 
							
						 
					 
					
						
						
							
							that was an unused import not a missing dependency  
						
						 
						
						
						
						
					 
					
						2012-08-25 00:44:14 +02:00