Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							c171e2c3e4 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4744: Enhance root admin API updateVolume with chaininfo parameter as a part of "Better control over first party objects" feature.  
						
						 
						
						
						
						
					 
					
						2014-02-19 18:01:18 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Santhosh Edukulla 
							
						 
					 
					
						
						
						
						
							
						
						
							3dbb2ae488 
							
						 
					 
					
						
						
							
							CLOUDSTACk-5674: Added fix for CLOUDSTACK-5674  
						
						 
						
						
						
						
					 
					
						2014-02-12 17:34:34 +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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jayapal 
							
						 
					 
					
						
						
						
						
							
						
						
							21d2e89dc1 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5966 enable/disable global setting for service monitor in VR  
						
						 
						
						... 
						
						
						
						corrected merged lines in sql file 
						
						
					 
					
						2014-02-11 16:24:21 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jayapal 
							
						 
					 
					
						
						
						
						
							
						
						
							11c5574b05 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5966 enable/disable global setting for service monitor in VR  
						
						 
						
						
						
						
					 
					
						2014-02-11 15:35:02 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							e0de79b170 
							
						 
					 
					
						
						
							
							Resource metadata: by default, all metadata is set with display=true (meaning that the detail is avaialble for display to the regular user). If admin wants to set a specific detail to be false, he has to specify it explicitly in addResourceDetail command  
						
						 
						
						
						
						
					 
					
						2014-02-10 12:05:59 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							3b58a45e04 
							
						 
					 
					
						
						
							
							Merge branch 'master' into rbac.  
						
						 
						
						
						
						
					 
					
						2014-02-07 13:43:36 -08: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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Hitchins 
							
						 
					 
					
						
						
						
						
							
						
						
							9cb2458a58 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5977 Fixed quotation mark issue  
						
						 
						
						... 
						
						
						
						Signed-off-by: Daan Hoogland <daan@onecht.net> 
						
						
					 
					
						2014-02-02 12:15:38 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							0e2e6995b7 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5997:  
						
						 
						
						... 
						
						
						
						Template state changes side affects 
						
						
					 
					
						2014-01-30 17:59:55 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							02bdb28d76 
							
						 
					 
					
						
						
							
							Resource metadata support for autoscale vm group object  
						
						 
						
						
						
						
					 
					
						2014-01-30 13:04:56 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							ce95f3122b 
							
						 
					 
					
						
						
							
							add 'recursive' column to permission table  
						
						 
						
						
						
						
					 
					
						2014-01-29 23:48:13 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							65c5de1cb6 
							
						 
					 
					
						
						
							
							Removed recently introduced api.servlet.endpoint global config as CS already has config serving the same purpose - 'endpointe.url'  
						
						 
						
						
						
						
					 
					
						2014-01-29 14:57:01 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							fdb25d6f5b 
							
						 
					 
					
						
						
							
							Resource metadata support for autoscaleVmProfile CS object  
						
						 
						
						
						
						
					 
					
						2014-01-29 14:57:00 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Girish Shilamkar 
							
						 
					 
					
						
						
						
						
							
						
						
							df58f51e33 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into marvin  
						
						 
						
						
						
						
					 
					
						2014-01-29 14:20:04 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							748dc1541c 
							
						 
					 
					
						
						
							
							Support attaching policy to account.  
						
						 
						
						
						
						
					 
					
						2014-01-28 10:00:17 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sanjay Tripathi 
							
						 
					 
					
						
						
						
						
							
						
						
							a735de8f85 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5953: In hypervisor_capabilities, max_guests_limit are  
						
						 
						
						... 
						
						
						
						not correct for XS 6.2 or other specific version hypervisor. 
						
						
					 
					
						2014-01-27 22:50:40 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Koushik Das 
							
						 
					 
					
						
						
						
						
							
						
						
							a0f21ff6bf 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5949: Remove unused field vnc_password from user_vm_view  
						
						 
						
						... 
						
						
						
						Removed unused field. This will ensure that list VM queries are not blocked. 
						
						
					 
					
						2014-01-27 15:43:20 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Damodar Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							4925b9f6a1 
							
						 
					 
					
						
						
							
							CLOUDSTACK-2031:support for number of ips per nic limit needs to be added for the multiple ip address per nic  
						
						 
						
						
						
						
					 
					
						2014-01-23 18:14:12 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Santhosh Edukulla 
							
						 
					 
					
						
						
						
						
							
						
						
							f999a01837 
							
						 
					 
					
						
						
							
							Added Fix for CLOUDSTACK-5875  
						
						 
						
						... 
						
						
						
						Added fix for exception and listing. Mentioned details under bug.
Post the fix, simulator works fine.
Signed-off-by: Santhosh Edukulla <Santhosh.Edukulla@citrix.com>
Signed-off-by: Koushik Das <koushik@apache.org> 
						
						
					 
					
						2014-01-23 17:11:33 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							39c0a302b4 
							
						 
					 
					
						
						
							
							Fix the isRootAdmin and isDomainAdmin to return true or false even if the permission is denied by IAM  
						
						 
						
						
						
						
					 
					
						2014-01-22 13:59:59 -08: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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sateesh Chodapuneedi 
							
						 
					 
					
						
						
						
						
							
						
						
							0e7146268d 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5868 Default templates are still referring to older templates in DB  
						
						 
						
						... 
						
						
						
						Updated URL and bits for 64-bit system vm template for VMware.
Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org> 
						
						
					 
					
						2014-01-21 11:02:09 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							452c20b242 
							
						 
					 
					
						
						
							
							Configuration: define "host" global config parameter in cloud-api package instead of ClusterManager as the parameter is mostly used by sevices components running remotely (consoleProxy, secondarystorage), or by third party integrators.  
						
						 
						
						... 
						
						
						
						Also intoroduced one more global config parameter - api.servlet.endpoint (default value is "http://localhost:8080/client/api ?"). The parameter defines API end point. Can be used by CS components/services deployed remotely, for sending CS API requests 
						
						
					 
					
						2014-01-20 13:37:52 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							929fbabaa2 
							
						 
					 
					
						
						
							
							Merge branch 'master' into rbac.  
						
						 
						
						
						
						
					 
					
						2014-01-17 14:37:08 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							3b8e5bdc86 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5886: cidr field-width to 2048  
						
						 
						
						
						
						
					 
					
						2014-01-16 21:46:53 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							6583cb3800 
							
						 
					 
					
						
						
							
							Add listAclGroupsByAccount to QuerySelector adapters and remove  
						
						 
						
						... 
						
						
						
						AclProxyService interface. 
						
						
					 
					
						2014-01-14 16:19:25 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							4bb31c2044 
							
						 
					 
					
						
						
							
							- Adding path to default group policy permission  
						
						 
						
						
						
						
					 
					
						2014-01-10 16:38:06 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							723f6c48eb 
							
						 
					 
					
						
						
							
							- Adding 'path' to IAM group and policy  
						
						 
						
						... 
						
						
						
						- Adding the default 'SystemCapability' action for root admin policy
- Adding the default 'DomainCapability' action for domain admin policy
- Adding the default 'DomainResourceCapability' action for domain admin policy 
						
						
					 
					
						2014-01-10 15:53:35 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Harikrishna Patnala 
							
						 
					 
					
						
						
						
						
							
						
						
							5bf78b82c0 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4904: Unable to see a derieved template if the  
						
						 
						
						... 
						
						
						
						parent template is deleted. Modified template_view so that removed(or InActive) templates also be there in the view.
Previous behavior of listing templates and state column in vm_templates will be the same. 
						
						
					 
					
						2014-01-10 10:26:10 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rajani Karuturi 
							
						 
					 
					
						
						
						
						
							
						
						
							f741d99c80 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5790: decrypted ldap hostname and port during upgrade as they are not encrypted now.  
						
						 
						
						... 
						
						
						
						Conflicts:
	engine/schema/src/com/cloud/upgrade/dao/Upgrade421to430.java
Signed-off-by: Abhinandan Prateek <aprateek@apache.org> 
						
						
					 
					
						2014-01-09 15:50:53 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rajani Karuturi 
							
						 
					 
					
						
						
						
						
							
						
						
							001e67ab02 
							
						 
					 
					
						
						
							
							Revert "CLOUDSTACK-5435 enabled encryption for ldap params"  
						
						 
						
						... 
						
						
						
						This reverts commit 1d5051f60e0b302287f4fd806a84e65afc7494d0.
Signed-off-by: Abhinandan Prateek <aprateek@apache.org> 
						
						
					 
					
						2014-01-09 15:50:53 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							5c1d639bc4 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5829:  
						
						 
						
						... 
						
						
						
						listvms should return the diskoffering id when deployed with an iso 
						
						
					 
					
						2014-01-08 18:32:51 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							850bc9fa82 
							
						 
					 
					
						
						
							
							Hook the OpenDaylight plugin into CloudStack  
						
						 
						
						
						
						
					 
					
						2014-01-08 15:58:08 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sanjay Tripathi 
							
						 
					 
					
						
						
						
						
							
						
						
							85df58d107 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5718: guest OS type for default template "CentOS 5.6(64-bit) no GUI (XenServer)" is CentOS 5.3(64-bit).  
						
						 
						
						
						
						
					 
					
						2014-01-07 16:28:22 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Likitha Shetty 
							
						 
					 
					
						
						
						
						
							
						
						
							617a71b450 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5780. [VMware] ESXi 5.5 - During live volume migration of ROOT and DATA volumes, suitable storage list is always empty  
						
						 
						
						... 
						
						
						
						Update hypervisor_capabilities to include capabilities for ESXi host 5.5 
						
						
					 
					
						2014-01-06 20:07:29 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ian Southam 
							
						 
					 
					
						
						
						
						
							
						
						
							b1eb8665b7 
							
						 
					 
					
						
						
							
							add column is_exclusive_gslb_provider is duplicated causing schema-421to430.sql to fail during install or upgrade  
						
						 
						
						
						
						
					 
					
						2014-01-06 14:29:27 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Bharat Kumar 
							
						 
					 
					
						
						
						
						
							
						
						
							91181a3b21 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5472 fixed the listvirtualmachines API to show cpu, memory and cpucores when using custom compute offering  
						
						 
						
						
						
						
					 
					
						2014-01-06 18:43:40 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Harikrishna Patnala 
							
						 
					 
					
						
						
						
						
							
						
						
							28fcd36290 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5608: HyperV Builtin and System vm template entries missing/need to update in 4.3 upgrade setup  
						
						 
						
						
						
						
					 
					
						2014-01-03 17:29:46 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Harikrishna Patnala 
							
						 
					 
					
						
						
						
						
							
						
						
							95fa931ff2 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5515: #cpu ,cpuspeed and ram is set to NULL in usage db(usage_vm_instance table) after vm stop and start Fixed populating usage event details in usage db on vm start/upgrade/dynamic_scale  
						
						 
						
						
						
						
					 
					
						2013-12-30 12:20:33 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rajesh Battala 
							
						 
					 
					
						
						
						
						
							
						
						
							d37ce1e7c1 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5321 Added default guest template  centos 6.4-x64 and modified hyperv systemvm template download url  
						
						 
						
						
						
						
					 
					
						2013-12-27 14:45:55 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Devdeep Singh 
							
						 
					 
					
						
						
						
						
							
						
						
							4fe63f7de8 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5655: hyper-v configuration parameters are missing in upgraded setup. Updated  
						
						 
						
						... 
						
						
						
						the db upgrade schema script to insert the configuration parameters. 
						
						
					 
					
						2013-12-27 13:15:40 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							fbba17e68c 
							
						 
					 
					
						
						
							
							Resource metadata support for cloudStack user  
						
						 
						
						
						
						
					 
					
						2013-12-23 14:25:07 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							79e64aa535 
							
						 
					 
					
						
						
							
							Resource metadata support for Disk Offering  
						
						 
						
						
						
						
					 
					
						2013-12-23 12:36:13 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rajani Karuturi 
							
						 
					 
					
						
						
						
						
							
						
						
							50a428c3aa 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4886: printing ****** to stdout instead of db users password  
						
						 
						
						
						
						
					 
					
						2013-12-20 17:38:39 +05:30