Girish Shilamkar 
							
						 
					 
					
						
						
						
						
							
						
						
							f0eb184d8a 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5674: Fix get_domain and remove dependency on ostype in get_template  
						
						 
						
						
						
						
					 
					
						2014-02-13 19:57:04 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Santhosh Edukulla 
							
						 
					 
					
						
						
						
						
							
						
						
							c0d8b9e334 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5674: getZoneForTests should return None if zone is "NA" in test_data.py  
						
						 
						
						
						
						
					 
					
						2014-02-14 10:45:14 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Girish Shilamkar 
							
						 
					 
					
						
						
						
						
							
						
						
							f3364ca6a4 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5674: Add missing test_data.py  
						
						 
						
						
						
						
					 
					
						2014-02-12 17:52:50 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Santhosh Edukulla 
							
						 
					 
					
						
						
						
						
							
						
						
							c78292e9cd 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6082: Add alternate zone creation under deploy DC  
						
						 
						
						
						
						
					 
					
						2014-02-12 17:35:19 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Santhosh Edukulla 
							
						 
					 
					
						
						
						
						
							
						
						
							3dbb2ae488 
							
						 
					 
					
						
						
							
							CLOUDSTACk-5674: Added fix for CLOUDSTACK-5674  
						
						 
						
						
						
						
					 
					
						2014-02-12 17:34:34 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Santhosh Edukulla 
							
						 
					 
					
						
						
						
						
							
						
						
							7cc9423b8d 
							
						 
					 
					
						
						
							
							CLOUDSTACk-5674: Added few misc changes to make it work.  
						
						 
						
						
						
						
					 
					
						2014-02-12 17:33:13 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Girish Shilamkar 
							
						 
					 
					
						
						
						
						
							
						
						
							c1d34369aa 
							
						 
					 
					
						
						
							
							Revert "CLOUDSTACK-5674: Few fixes"  
						
						 
						
						... 
						
						
						
						This reverts commit e6b93b0a6824a3f2845fb42596c04b348ae147e2. 
						
						
					 
					
						2014-02-12 17:27:47 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Girish Shilamkar 
							
						 
					 
					
						
						
						
						
							
						
						
							e6b93b0a68 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5674: Few fixes  
						
						 
						
						
						
						
					 
					
						2014-02-11 14:54:46 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Girish Shilamkar 
							
						 
					 
					
						
						
						
						
							
						
						
							995e3f5b5d 
							
						 
					 
					
						
						
							
							Revert "CLOUDSTACK-5674: Few new fixes"  
						
						 
						
						... 
						
						
						
						This reverts commit 3493f17bad3b8b57778b62d464c5e7f910351cc0. 
						
						
					 
					
						2014-02-11 12:36:07 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Girish Shilamkar 
							
						 
					 
					
						
						
						
						
							
						
						
							3493f17bad 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5674: Few new fixes  
						
						 
						
						
						
						
					 
					
						2014-02-09 16:04:31 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Marcus Sorensen 
							
						 
					 
					
						
						
						
						
							
						
						
							ce6539bd43 
							
						 
					 
					
						
						
							
							add new devcloud-kvm config  
						
						 
						
						
						
						
					 
					
						2014-02-09 00:20:01 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Marcus Sorensen 
							
						 
					 
					
						
						
						
						
							
						
						
							df77c4310a 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6103: Pass VM iso information along with  
						
						 
						
						... 
						
						
						
						PrepareForMigrationCommand, so that destination hypervisor can
mount pool. This further exposed an issue for KVM where iso
was not getting cleaned up upon successful migration, fixed as well. 
						
						
					 
					
						2014-02-14 00:34:48 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ashutosh K 
							
						 
					 
					
						
						
						
						
							
						
						
							899ad17393 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5978: Changes in get_template function to make it  
						
						 
						
						... 
						
						
						
						independent of ostype passed through test case 
						
						
					 
					
						2014-02-10 12:38:09 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Gaurav Aradhye 
							
						 
					 
					
						
						
						
						
							
						
						
							d44c850445 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5959: Fixed cascading failures in portable IP test cases  
						
						 
						
						
						
						
					 
					
						2014-02-10 12:34:17 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							3b58a45e04 
							
						 
					 
					
						
						
							
							Merge branch 'master' into rbac.  
						
						 
						
						
						
						
					 
					
						2014-02-07 13:43:36 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							28ac2f758e 
							
						 
					 
					
						
						
							
							Every tar has it's own way of doing things  
						
						 
						
						
						
						
					 
					
						2014-02-05 11:48:53 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							3df97bd663 
							
						 
					 
					
						
						
							
							Sync systemvm and systemvm64 build instructions  
						
						 
						
						
						
						
					 
					
						2014-02-05 11:21:23 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							0ce488849d 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5932: update the definitions with the new debian version  
						
						 
						
						
						
						
					 
					
						2014-02-05 10:52:36 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Abhinandan Prateek 
							
						 
					 
					
						
						
						
						
							
						
						
							18191ce79a 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5932: updated script with the valid iso download urls  
						
						 
						
						
						
						
					 
					
						2014-02-05 10:38:26 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							f84375442e 
							
						 
					 
					
						
						
							
							Merge branch 'master' into rbac  
						
						 
						
						... 
						
						
						
						Conflicts:
	api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmProfilesCmd.java
	api/src/org/apache/cloudstack/api/command/user/volume/ResizeVolumeCmd.java
	plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/MockAccountManager.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/api/query/QueryManagerImpl.java
	server/src/com/cloud/template/TemplateAdapterBase.java
	setup/db/db/schema-430to440.sql
	tools/apidoc/gen_toc.py 
						
						
					 
					
						2014-02-04 12:07:32 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Santhosh Edukulla 
							
						 
					 
					
						
						
						
						
							
						
						
							286afda5d6 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5980: Fix test case failing with "Error reading SSH protocol banner" ssh error  
						
						 
						
						
						
						
					 
					
						2014-02-04 15:45:45 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Santhosh Edukulla 
							
						 
					 
					
						
						
						
						
							
						
						
							bf72441d13 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6006: Remove integration folder and lib  
						
						 
						
						
						
						
					 
					
						2014-02-04 12:01:58 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Santhosh Edukulla 
							
						 
					 
					
						
						
						
						
							
						
						
							a908b8d94b 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5793: Fixed few issues related CLOUDSTACK-5973  
						
						 
						
						
						
						
					 
					
						2014-02-04 11:23:10 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Abhinandan Prateek 
							
						 
					 
					
						
						
						
						
							
						
						
							d578d7ef85 
							
						 
					 
					
						
						
							
							update packages list before getting jre 7  
						
						 
						
						... 
						
						
						
						(cherry picked from commit 5121f8cd4e4adcdf23b6ec25cb1c28bec8f417a7)
Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com> 
						
						
					 
					
						2014-01-31 09:42:31 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Abhinandan Prateek 
							
						 
					 
					
						
						
						
						
							
						
						
							0685371179 
							
						 
					 
					
						
						
							
							updating the jre to version 7 on system vms  
						
						 
						
						... 
						
						
						
						(cherry picked from commit fc2e7ec70a1cc48a10a168ec3df607b49a7bcdf6)
Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com> 
						
						
					 
					
						2014-01-31 09:41:41 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							13e6c2fe72 
							
						 
					 
					
						
						
							
							Fixed API doc that got broken by adding new commands for stratosphere ssp plugin  
						
						 
						
						... 
						
						
						
						Conflicts:
	tools/apidoc/gen_toc.py 
						
						
					 
					
						2014-01-30 11:01:03 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Girish Shilamkar 
							
						 
					 
					
						
						
						
						
							
						
						
							df58f51e33 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into marvin  
						
						 
						
						
						
						
					 
					
						2014-01-29 14:20:04 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Santhosh Edukulla 
							
						 
					 
					
						
						
						
						
							
						
						
							d057585128 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5948: Fixes to BVT test_volumes.py  
						
						 
						
						... 
						
						
						
						1. Added a generic way of verifying isk volumes.
2. Now, detach volume is called post the assert.
3. Added a sleep post detach volume to facilitate list volumes to have some time for detach operation.
4. Added a fix for a log check. 
						
						
					 
					
						2014-01-29 10:36:23 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Girish Shilamkar 
							
						 
					 
					
						
						
						
						
							
						
						
							226df296d0 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5674: Some fixes to marvin and resultant changes to tests.  
						
						 
						
						
						
						
					 
					
						2014-01-28 02:11:24 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Girish Shilamkar 
							
						 
					 
					
						
						
						
						
							
						
						
							7305063fb4 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5925: get_*() functionality changed in marvin, changed BVT too.  
						
						 
						
						
						
						
					 
					
						2014-01-28 11:12:24 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							c2da280347 
							
						 
					 
					
						
						
							
							Add a zipped version of the hyperv image that we can store in the archives on the jenkins server  
						
						 
						
						
						
						
					 
					
						2014-01-23 09:06:33 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							33cd1ab921 
							
						 
					 
					
						
						
							
							Merge branch 'master' into rbac  
						
						 
						
						
						
						
					 
					
						2014-01-22 11:23:51 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Santhosh Edukulla 
							
						 
					 
					
						
						
						
						
							
						
						
							edfd2b6799 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5764: Some fixes to marvin  
						
						 
						
						
						
						
					 
					
						2014-01-22 18:34:10 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Girish Shilamkar 
							
						 
					 
					
						
						
						
						
							
						
						
							6a2cc9fbd0 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5925: Moved test data from testsuites to marvin/config  
						
						 
						
						... 
						
						
						
						Also merged redundant testdata as they were found. 
						
						
					 
					
						2014-01-22 12:21:07 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Santhosh Edukulla 
							
						 
					 
					
						
						
						
						
							
						
						
							9393275611 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5674: Added Fix for CLOUDSTACK-5674,5498,5500 and other issues as  
						
						 
						
						... 
						
						
						
						part of cleanup 
						
						
					 
					
						2014-01-22 12:19:20 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							929fbabaa2 
							
						 
					 
					
						
						
							
							Merge branch 'master' into rbac.  
						
						 
						
						
						
						
					 
					
						2014-01-17 14:37:08 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							ecf57c368a 
							
						 
					 
					
						
						
							
							Adjust values for this version of vbox  
						
						 
						
						
						
						
					 
					
						2014-01-17 17:23:46 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							50054fe060 
							
						 
					 
					
						
						
							
							Namespaces are important  
						
						 
						
						
						
						
					 
					
						2014-01-17 16:00:10 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Milamber 
							
						 
					 
					
						
						
						
						
							
						
						
							cb7b1dc276 
							
						 
					 
					
						
						
							
							Add Dutch (Netherlands, Polish languages in Web UI Change Japanese code (ja -> ja_JP) Update transifex sync config  
						
						 
						
						... 
						
						
						
						Conflicts:
	client/WEB-INF/classes/resources/messages_es.properties
	client/WEB-INF/classes/resources/messages_pt_BR.properties 
						
						
					 
					
						2014-01-17 11:15:09 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							dcf9607a46 
							
						 
					 
					
						
						
							
							Fixed code style errors breaking the build  
						
						 
						
						
						
						
					 
					
						2014-01-16 14:05:20 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							da8ee45a24 
							
						 
					 
					
						
						
							
							Why is the easy solution always to hard  
						
						 
						
						
						
						
					 
					
						2014-01-16 17:27:13 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							95a92ad2e3 
							
						 
					 
					
						
						
							
							Fix typo in convert call  
						
						 
						
						
						
						
					 
					
						2014-01-16 16:41:46 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							5d24843ef5 
							
						 
					 
					
						
						
							
							Proper cleanup before the next build of the systemvm  
						
						 
						
						
						
						
					 
					
						2014-01-16 16:03:56 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							bf26efc551 
							
						 
					 
					
						
						
							
							Little hack until we can install xsltproc on the buildslave  
						
						 
						
						
						
						
					 
					
						2014-01-16 15:33:05 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							794d47c5f2 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5883 Convert ovf file to proper format for ESXi  
						
						 
						
						
						
						
					 
					
						2014-01-16 14:43:44 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Santhosh Edukulla 
							
						 
					 
					
						
						
						
						
							
						
						
							3a3d8f27dd 
							
						 
					 
					
						
						
							
							Fix for CLOUDSTACK-5864  
						
						 
						
						... 
						
						
						
						Fixed the mentioned issue.
Signed-off-by: Santhosh Edukulla <Santhosh.Edukulla@citrix.com> 
						
						
					 
					
						2014-01-15 11:45:58 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ashutosh K 
							
						 
					 
					
						
						
						
						
							
						
						
							c108d7f0d0 
							
						 
					 
					
						
						
							
							CLOUDSTACK-2237: Automation-Adding next set of test cases for feature - SG in advanced zone  
						
						 
						
						
						
						
					 
					
						2014-01-14 14:34:21 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								SrikanteswaraRao Talluri 
							
						 
					 
					
						
						
						
						
							
						
						
							c98ac9aae0 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5113: Fix get_template method to return 'BUILTIN' template in ready state with  
						
						 
						
						... 
						
						
						
						matching given ostype 
						
						
					 
					
						2014-01-10 19:56:38 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							c69a412c43 
							
						 
					 
					
						
						
							
							Remove old prepareSecondaryStorageForMigration from gen_toc.py.  
						
						 
						
						
						
						
					 
					
						2014-01-09 10:12:22 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							7c8facf3c9 
							
						 
					 
					
						
						
							
							Change checkstyle to run on every sub project, so it will also run when you build an individual module  
						
						 
						
						
						
						
					 
					
						2014-01-09 17:00:11 +01:00