Prasanna Santhanam 
							
						 
					 
					
						
						
						
						
							
						
						
							97b7873590 
							
						 
					 
					
						
						
							
							Splitting resource_limit tests to allocation_states tests  
						
						 
						
						
						
						
					 
					
						2012-09-12 18:48:32 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prasanna Santhanam 
							
						 
					 
					
						
						
						
						
							
						
						
							149bcb390b 
							
						 
					 
					
						
						
							
							adding attributes to the smoke tests  
						
						 
						
						
						
						
					 
					
						2012-09-12 18:48:32 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prasanna Santhanam 
							
						 
					 
					
						
						
						
						
							
						
						
							9043e49522 
							
						 
					 
					
						
						
							
							migrating tags to attr decorators for nose attrib classification  
						
						 
						
						
						
						
					 
					
						2012-09-12 18:48:32 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prasanna Santhanam 
							
						 
					 
					
						
						
						
						
							
						
						
							bb8016e08b 
							
						 
					 
					
						
						
							
							Applying tags as attribute decorators for nose  
						
						 
						
						
						
						
					 
					
						2012-09-12 18:48:32 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prasanna Santhanam 
							
						 
					 
					
						
						
						
						
							
						
						
							a021c24c85 
							
						 
					 
					
						
						
							
							eip elb related fixes : corrected regex  
						
						 
						
						
						
						
					 
					
						2012-09-12 18:48:32 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prasanna Santhanam 
							
						 
					 
					
						
						
						
						
							
						
						
							b5bf6df75f 
							
						 
					 
					
						
						
							
							elb test related fixes  
						
						 
						
						
						
						
					 
					
						2012-09-12 18:48:32 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prasanna Santhanam 
							
						 
					 
					
						
						
						
						
							
						
						
							cdbffdb334 
							
						 
					 
					
						
						
							
							Fixed mount command and logging in snapshot tests  
						
						 
						
						
						
						
					 
					
						2012-09-12 18:48:32 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prasanna Santhanam 
							
						 
					 
					
						
						
						
						
							
						
						
							6e7b513810 
							
						 
					 
					
						
						
							
							Rearranging the project test suite according to global configs required  
						
						 
						
						... 
						
						
						
						* Skipping if the global config required is not set
    * Cleanup the email tests from project suite 
						
						
					 
					
						2012-09-12 18:48:32 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prasanna Santhanam 
							
						 
					 
					
						
						
						
						
							
						
						
							0119e6d04e 
							
						 
					 
					
						
						
							
							Fixing the vm_life_cycle expunge test  
						
						 
						
						... 
						
						
						
						* expunge.interval determines the ExpungeTask interval to cleanup the
VM and post expunge.delay seconds we delete the VM entry. So let's just
wait long enough 
						
						
					 
					
						2012-09-12 18:48:31 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prasanna Santhanam 
							
						 
					 
					
						
						
						
						
							
						
						
							ecfdb3af5c 
							
						 
					 
					
						
						
							
							SecondaryStorage is always in Alert state. We need to check for SSVM.  
						
						 
						
						
						
						
					 
					
						2012-09-12 18:48:31 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prasanna Santhanam 
							
						 
					 
					
						
						
						
						
							
						
						
							e7e7085b86 
							
						 
					 
					
						
						
							
							Fixing imports to remoteSSHClient for EIP/ELB  
						
						 
						
						
						
						
					 
					
						2012-09-12 18:48:31 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prasanna Santhanam 
							
						 
					 
					
						
						
						
						
							
						
						
							bd6d354975 
							
						 
					 
					
						
						
							
							Fixes to scripts  
						
						 
						
						... 
						
						
						
						* remoteSSHClient import is fixed
* mount now explicitly specifies filesystem 
						
						
					 
					
						2012-09-12 18:48:31 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prasanna Santhanam 
							
						 
					 
					
						
						
						
						
							
						
						
							dfede8cdeb 
							
						 
					 
					
						
						
							
							SecondaryStorageVM state should be checked for it Up status  
						
						 
						
						
						
						
					 
					
						2012-09-12 18:48:31 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prasanna Santhanam 
							
						 
					 
					
						
						
						
						
							
						
						
							a887f8d6ce 
							
						 
					 
					
						
						
							
							Fixing the syntax errors while fixing whitespaces  
						
						 
						
						
						
						
					 
					
						2012-09-12 18:48:31 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prasanna Santhanam 
							
						 
					 
					
						
						
						
						
							
						
						
							b433b1afa6 
							
						 
					 
					
						
						
							
							Various fixes to tests  
						
						 
						
						... 
						
						
						
						- Configuration fixes in Security groups and Egress rules
- Fixing white spaces in component test suite 
						
						
					 
					
						2012-09-12 18:48:31 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prasanna Santhanam 
							
						 
					 
					
						
						
						
						
							
						
						
							a725fdc3ab 
							
						 
					 
					
						
						
							
							Adding the tags for different configurations in to testcase  
						
						 
						
						
						
						
					 
					
						2012-09-12 18:48:30 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prasanna Santhanam 
							
						 
					 
					
						
						
						
						
							
						
						
							8d74305707 
							
						 
					 
					
						
						
							
							Adding tags that identify deployment configurations against test cases  
						
						 
						
						... 
						
						
						
						* advanced - Advanced Zone only
* basic  - basic zone without SecurityGroups
* sg - basic zone with security groups
* eip - basic zone with EIP/ELB
* advancedns - Advanced Zone with NetScalers 
						
						
					 
					
						2012-09-12 18:48:30 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prasanna Santhanam 
							
						 
					 
					
						
						
						
						
							
						
						
							cddcc097b9 
							
						 
					 
					
						
						
							
							Fixing the remoteSSHClient imports, migrate VM, SSVM and router tests  
						
						 
						
						
						
						
					 
					
						2012-09-12 18:48:30 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prasanna Santhanam 
							
						 
					 
					
						
						
						
						
							
						
						
							ecfa3e7cf8 
							
						 
					 
					
						
						
							
							Revert "Marked copy to another zone tests as expectedFailure". This reverts commit 18a3e3cf2b922a7fa3eab93df6e9288f3bafb827.  
						
						 
						
						
						
						
					 
					
						2012-09-12 18:48:30 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prasanna Santhanam 
							
						 
					 
					
						
						
						
						
							
						
						
							dfb368d0fa 
							
						 
					 
					
						
						
							
							Marked copy to another zone tests as expectedFailure  
						
						 
						
						
						
						
					 
					
						2012-09-12 18:48:30 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							f93dd21602 
							
						 
					 
					
						
						
							
							fix ant debug  
						
						 
						
						
						
						
					 
					
						2012-09-11 20:24:29 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hiroaki Kawai 
							
						 
					 
					
						
						
						
						
							
						
						
							b3d4246a14 
							
						 
					 
					
						
						
							
							typo in cloud-install-sys-tmplt  
						
						 
						
						
						
						
					 
					
						2012-09-11 18:37:24 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							bfcc31d9ed 
							
						 
					 
					
						
						
							
							CLOUDSTACK-51: Outdated docs and license data present in awsapi  
						
						 
						
						... 
						
						
						
						CLOUDSTACK-53: CloudBridge installation pieces present, deprecated? 
						
						
					 
					
						2012-09-11 15:26:28 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							6ead90ab3b 
							
						 
					 
					
						
						
							
							CLOUDSTACK-53: CloudBridge installation pieces present, deprecated?  
						
						 
						
						... 
						
						
						
						CLOUDSTACK-51: Outdated docs and license data present in awsapi
Removing content that is not used by awsapi. 
						
						
					 
					
						2012-09-11 15:17:20 -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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Pranav Saxena 
							
						 
					 
					
						
						
						
						
							
						
						
							6949b40c94 
							
						 
					 
					
						
						
							
							Merge branch 'master' of  https://git-wip-us.apache.org/repos/asf/incubator-cloudstack  
						
						 
						
						
						
						
					 
					
						2012-09-11 21:32:35 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Radhika Puthiyetath 
							
						 
					 
					
						
						
						
						
							
						
						
							a19c962bf5 
							
						 
					 
					
						
						
							
							Feature Documentation for s2svpn interVlan Reviewed-By:Jessica Tomechak  
						
						 
						
						
						
						
					 
					
						2012-09-11 21:31:51 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Wido den Hollander 
							
						 
					 
					
						
						
						
						
							
						
						
							a572e59411 
							
						 
					 
					
						
						
							
							debian: Remove *.conffiles files  
						
						 
						
						... 
						
						
						
						By default any file in /etc is a conffile according to dh_installdeb compat >= 3 
						
						
					 
					
						2012-09-11 17:47:09 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Wido den Hollander 
							
						 
					 
					
						
						
						
						
							
						
						
							0af8606581 
							
						 
					 
					
						
						
							
							debian: Add the MySQL connector to the classpath  
						
						 
						
						... 
						
						
						
						This JAR is installed through a dependency, but it needs to be added to the classpath. 
						
						
					 
					
						2012-09-11 17:33:18 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Wido den Hollander 
							
						 
					 
					
						
						
						
						
							
						
						
							ecea6bec8c 
							
						 
					 
					
						
						
							
							waf: Remove jnetpcap.jar from the common JAR files  
						
						 
						
						... 
						
						
						
						jnetpcap got removed some time ago with commit:e7995d09dce78434cce530b0428bcf69f00ff066 
						
						
					 
					
						2012-09-11 17:29:01 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Wido den Hollander 
							
						 
					 
					
						
						
						
						
							
						
						
							d4ca7361c1 
							
						 
					 
					
						
						
							
							debian: Add two JAR files to cloud-deps  
						
						 
						
						... 
						
						
						
						These are not available through the Ubuntu or Debian repositories 
						
						
					 
					
						2012-09-11 16:42:39 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hiroaki Kawai 
							
						 
					 
					
						
						
						
						
							
						
						
							739d4baf55 
							
						 
					 
					
						
						
							
							Patch from kawai@stratosphere.co.jp to resolve a Fedora dependency issue.  
						
						 
						
						... 
						
						
						
						https://reviews.apache.org/r/7009/ 
Signed-off-by: Chip Childers <chip.childers@gmail.com> 
						
						
					 
					
						2012-09-11 10:13:52 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Wido den Hollander 
							
						 
					 
					
						
						
						
						
							
						
						
							0429cce9e5 
							
						 
					 
					
						
						
							
							debian: Update locations where to search for Java under Ubuntu and Debian  
						
						 
						
						
						
						
					 
					
						2012-09-11 15:22:17 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Wido den Hollander 
							
						 
					 
					
						
						
						
						
							
						
						
							93126414bc 
							
						 
					 
					
						
						
							
							debian: Get backport-util-concurrent from the Debian repositories  
						
						 
						
						
						
						
					 
					
						2012-09-11 14:03:38 +02: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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Wido den Hollander 
							
						 
					 
					
						
						
						
						
							
						
						
							e7ff6ecd77 
							
						 
					 
					
						
						
							
							debian: Depend on jsch from the repository  
						
						 
						
						... 
						
						
						
						This way we don't need to distribute the JAR in cloud-deps 
						
						
					 
					
						2012-09-11 13:31:50 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Wido den Hollander 
							
						 
					 
					
						
						
						
						
							
						
						
							a84ec1218d 
							
						 
					 
					
						
						
							
							debian: Install cglib through the package manager  
						
						 
						
						... 
						
						
						
						cglib 2.2.2 is available in Ubuntu and Debian from the repositories, no need
to ship it in the cloud-deps package.
It's also not used by cloud-agent, but by cloud-utils, so place the dependency there. 
						
						
					 
					
						2012-09-11 13:24:26 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Radhika Puthiyetath 
							
						 
					 
					
						
						
						
						
							
						
						
							4a8bb9dfc7 
							
						 
					 
					
						
						
							
							Feature Documentation for s2svpn interVlan and Autoscale  
						
						 
						
						
						
						
					 
					
						2012-09-11 14:23:59 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mice Xia 
							
						 
					 
					
						
						
						
						
							
						
						
							87ecde648f 
							
						 
					 
					
						
						
							
							CLOUDSTACK-72 Error label in traffic type edit dialog in zoneWizard  
						
						 
						
						
						
						
					 
					
						2012-09-11 14:06:00 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prasanna Santhanam 
							
						 
					 
					
						
						
						
						
							
						
						
							c4f91b2914 
							
						 
					 
					
						
						
							
							Write results to stdout when result log is not specified  
						
						 
						
						
						
						
					 
					
						2012-09-11 11:06:23 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison.Su 
							
						 
					 
					
						
						
						
						
							
						
						
							653cdb3c5d 
							
						 
					 
					
						
						
							
							CLOUDSTACK-64: remove junit  
						
						 
						
						
						
						
					 
					
						2012-09-10 23:15:05 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison.Su 
							
						 
					 
					
						
						
						
						
							
						
						
							98ab449bd0 
							
						 
					 
					
						
						
							
							don't compile xenapi  
						
						 
						
						
						
						
					 
					
						2012-09-10 22:35:06 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison.Su 
							
						 
					 
					
						
						
						
						
							
						
						
							52d8849003 
							
						 
					 
					
						
						
							
							fix rpm build  
						
						 
						
						
						
						
					 
					
						2012-09-10 22:33:41 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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