Star Guo 
							
						 
					 
					
						
						
						
						
							
						
						
							290938b08e 
							
						 
					 
					
						
						
							
							scripts: add ip set interface up because in CentOS7 the interface will not auto up  
						
						... 
						
						
						
						This closes  #97 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> 
						
						
					 
					
						2015-03-10 10:18:10 +05:30 
						 
				 
			
				
					
						
							
							
								Jayapal 
							
						 
					 
					
						
						
						
						
							
						
						
							dd6bcde65b 
							
						 
					 
					
						
						
							
							CLOUDSTACK-8298: Update copying large size VR config file in xenserver  
						
						... 
						
						
						
						When there is large size VR configuration (aggregate commands) copying data to VR using vmops plugin was failed
 because of the ARG_MAX size limitation. The configuration data size is around 300KB.
 Updated this to create file in host by scp with file contents. This will create file in host.
 Then copy the file from the host to VR using hte vmops createFileInDomr method.
  In host file get created in /tmp/ with name VR-<UUID>.cfg, once it copied to VR this file will be removed.
(cherry picked from commit 619f0142555d2245e3fa90036f825525191b31bd)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> 
						
						
					 
					
						2015-03-04 16:56:07 +05:30 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							f70afa1375 
							
						 
					 
					
						
						
							
							scripts: use cloudmanagementserver.keystore instead of cloud.keystore  
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> 
						
						
					 
					
						2015-02-28 17:05:29 +05:30 
						 
				 
			
				
					
						
							
							
								Marcus Sorensen 
							
						 
					 
					
						
						
						
						
							
						
						
							e77b4ae8e8 
							
						 
					 
					
						
						
							
							CLOUDSTACK-8263: KVM - use virsh instead of libvirt for resizing qcow2, as libvirt bindings are insufficient  
						
						... 
						
						
						
						Change-Id: I08246219cb1469a46dc6a9ec76a8c3a67b0b8bf6 
						
						
					 
					
						2015-02-17 18:10:08 -08:00 
						 
				 
			
				
					
						
							
							
								Marcus Sorensen 
							
						 
					 
					
						
						
						
						
							
						
						
							61a50ce5e4 
							
						 
					 
					
						
						
							
							CLOUDSTACK-8263: KVM - notify qemu process of resized volume for libvirt-resized storage  
						
						... 
						
						
						
						Change-Id: Iddd8bb068855d3565075d3ecf7c6c0f074d00e1a 
						
						
					 
					
						2015-02-17 14:27:13 -08:00 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							cf7a8cc052 
							
						 
					 
					
						
						
							
							CLOUDSTACK-8220: Let's have a separate XenServer 6.5 resource  
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 06437dadf51160252724767fc219de19f96de374)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> 
						
						
					 
					
						2015-02-06 14:45:06 +05:30 
						 
				 
			
				
					
						
							
							
								Remi Bergsma 
							
						 
					 
					
						
						
						
						
							
						
						
							66b77380d0 
							
						 
					 
					
						
						
							
							use directIO flags when dd'ing template  
						
						... 
						
						
						
						This makes sure dom0 in xenserver doesn't get hammered
when copying templates. It doesn't make sense to use
the cache of dom0 as the template does not fit in
memory. The directIO flags prevent it from trying.
(cherry picked from commit 4e1527e87aaaa87d14d3c7d3a6782b80cbf36a8c) 
						
						
					 
					
						2014-12-16 10:49:57 +01:00 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							752980f370 
							
						 
					 
					
						
						
							
							Revert "packaging: updated hardcoded jasypt version to 1.9.2"  
						
						... 
						
						
						
						This reverts commit 43f39a1ec37de08e5b8e97dfd74a853c0aae76c7. 
						
						
					 
					
						2014-12-04 19:47:10 +05:30 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							43f39a1ec3 
							
						 
					 
					
						
						
							
							packaging: updated hardcoded jasypt version to 1.9.2  
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> 
						
						
					 
					
						2014-12-04 04:02:46 +05:30 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							2667855ccb 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5446:  
						
						... 
						
						
						
						delete all the leftover snapshots on primary storage in case of snapshot
errors, after a new backup snapshot is finished 
						
						
					 
					
						2014-11-19 15:54:09 -08:00 
						 
				 
			
				
					
						
							
							
								Pierre-Luc Dion 
							
						 
					 
					
						
						
						
						
							
						
						
							6c955a3a47 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7887: change int to str into swiftxen  
						
						
						
						
					 
					
						2014-11-12 19:22:13 -05:00 
						 
				 
			
				
					
						
							
							
								Sanjay Tripathi 
							
						 
					 
					
						
						
						
						
							
						
						
							e6907ed8df 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7868: Failed storage.PrimaryStorageDownloadCommand leaves corrupt VDIs in primary storage.  
						
						
						
						
					 
					
						2014-11-08 13:46:45 +05:30 
						 
				 
			
				
					
						
							
							
								Rajesh Battala 
							
						 
					 
					
						
						
						
						
							
						
						
							42fd2d91da 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7654 fixed issues with zip format templates.  
						
						... 
						
						
						
						(cherry picked from commit 67ff7dac8290560715629241e09fe9fb0359c990) 
						
						
					 
					
						2014-10-13 00:30:23 -04:00 
						 
				 
			
				
					
						
							
							
								David Nalley 
							
						 
					 
					
						
						
						
						
							
						
						
							ac48aa8e0c 
							
						 
					 
					
						
						
							
							cleaning up some from a revert  
						
						
						
						
					 
					
						2014-10-12 23:30:04 -04:00 
						 
				 
			
				
					
						
							
							
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							6687727b76 
							
						 
					 
					
						
						
							
							Frank forgot the license header  
						
						
						
						
					 
					
						2014-09-19 10:14:38 +02:00 
						 
				 
			
				
					
						
							
							
								Frank Zhang 
							
						 
					 
					
						
						
						
						
							
						
						
							8b89494a35 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6278  
						
						... 
						
						
						
						Baremetal Advanced Networking support 
						
						
					 
					
						2014-09-18 16:54:37 -07:00 
						 
				 
			
				
					
						
							
							
								Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							6e1e56d399 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7527 reboot faster by writing to /proc/sysrq-trigger  
						
						... 
						
						
						
						(cherry picked from commit d04f59a30d130dbb83f162af6e67334fe2c9cef0) 
						
						
					 
					
						2014-09-18 12:51:42 +02:00 
						 
				 
			
				
					
						
							
							
								Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							dec9133dcd 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7184: xenheartbeat gets passed timeout and interval  
						
						... 
						
						
						
						(cherry picked from commit 4d065b9a3a336d59902c266202c1094509c007d2)
Conflicts:
	plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/discoverer/XcpServerDiscoverer.java
	plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
	server/src/com/cloud/configuration/Config.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
	server/src/com/cloud/resource/DiscovererBase.java 
						
						
					 
					
						2014-09-18 12:51:10 +02:00 
						 
				 
			
				
					
						
							
							
								Kishan Kavala 
							
						 
					 
					
						
						
						
						
							
						
						
							4f3de024de 
							
						 
					 
					
						
						
							
							Add script to ensure cgroups are not co-mounted in rhel7/lxc. If required, script will unmount co-mounted cgroups and remount them seperately  
						
						
						
						
					 
					
						2014-09-11 14:34:40 +05:30 
						 
				 
			
				
					
						
							
							
								Kishan Kavala 
							
						 
					 
					
						
						
						
						
							
						
						
							08dc5c6f91 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7428: Allow LXC cluster in SG enabled zones. Use lxc driver in security_group.py script for lxc host  
						
						
						
						
					 
					
						2014-08-27 11:52:59 +05:30 
						 
				 
			
				
					
						
							
							
								Anthony Xu 
							
						 
					 
					
						
						
						
						
							
						
						
							bd6f03aa95 
							
						 
					 
					
						
						
							
							iptreemap is not supported in new ipset, use iphash instead  
						
						
						
						
					 
					
						2014-08-25 11:22:30 -07:00 
						 
				 
			
				
					
						
							
							
								Kishan Kavala 
							
						 
					 
					
						
						
						
						
							
						
						
							b37ee25359 
							
						 
					 
					
						
						
							
							replace vconfig with ip link  
						
						
						
						
					 
					
						2014-08-22 15:39:04 +05:30 
						 
				 
			
				
					
						
							
							
								Vincent Bernat 
							
						 
					 
					
						
						
						
						
							
						
						
							53650ed7bf 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7193: handle domain ID being an int  
						
						... 
						
						
						
						Recent versions of libvirt (at least 0.9.8) will return an int when
queried for the ID of a domain, not a string. This breaks some parts of
the `security_group.py` script which expects a string containing an
int. Notably, this breaks the part handling VM reboots which is
therefore not executed.
Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch>
Signed-off-by: Sebastien Goasguen <runseb@gmail.com> 
						
						
					 
					
						2014-08-18 10:36:21 -04:00 
						 
				 
			
				
					
						
							
							
								Brenn Oosterbaan 
							
						 
					 
					
						
						
						
						
							
						
						
							7c92bac4a3 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7345 changed dd blocksize to 128k when using NFS.  
						
						... 
						
						
						
						Signed-off-by: Daan Hoogland <daan@onecht.net>
(cherry picked from commit 8b7130fa65a3ce010a54015b3350b94b56414462) 
						
						
					 
					
						2014-08-14 10:10:13 +02:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							f30fc6b673 
							
						 
					 
					
						
						
							
							need to check ccp-qemu-img  
						
						
						
						
					 
					
						2014-08-12 15:13:42 -07:00 
						 
				 
			
				
					
						
							
							
								Joris van Lieshout 
							
						 
					 
					
						
						
						
						
							
						
						
							37baddd721 
							
						 
					 
					
						
						
							
							dd with direct io is less impacting on Dom0 kernel resources  
						
						... 
						
						
						
						Signed-off-by: Daan Hoogland <daan@onecht.net>
(cherry picked from commit c4b78c3aaa8df20c8e892b9d5108d8f34f96ed0c) 
						
						
					 
					
						2014-08-12 13:17:02 +02:00 
						 
				 
			
				
					
						
							
							
								Frank.Zhang 
							
						 
					 
					
						
						
						
						
							
						
						
							12ad254069 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6278  
						
						... 
						
						
						
						Baremetal Advanced Networking support
    add missing license header 
						
						
					 
					
						2014-08-05 11:11:02 -07:00 
						 
				 
			
				
					
						
							
							
								Frank.Zhang 
							
						 
					 
					
						
						
						
						
							
						
						
							1ee7e0c77e 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6278  
						
						... 
						
						
						
						Baremetal Advanced Networking support 
						
						
					 
					
						2014-08-04 15:00:44 -07:00 
						 
				 
			
				
					
						
							
							
								Frank.Zhang 
							
						 
					 
					
						
						
						
						
							
						
						
							88f866645b 
							
						 
					 
					
						
						
							
							fix iptables chain name too long (must be under 30 chars)  
						
						
						
						
					 
					
						2014-07-18 17:31:06 -07:00 
						 
				 
			
				
					
						
							
							
								Anthony Xu 
							
						 
					 
					
						
						
						
						
							
						
						
							733102c742 
							
						 
					 
					
						
						
							
							change XS log file name from vmops.log to cloud.log  
						
						
						
						
					 
					
						2014-07-15 11:07:15 -07:00 
						 
				 
			
				
					
						
							
							
								Koushik Das 
							
						 
					 
					
						
						
						
						
							
						
						
							4607c26949 
							
						 
					 
					
						
						
							
							Revert "CLOUDSTACK-6834 : 3. Some description changes words like CloudStack etc 4. Change Default installation location if possible include version number 5. Mysql Connector Installer along with other dependecies 6. Add run Service Checkbox 7. Add ReadMe checkbox"  
						
						... 
						
						
						
						This reverts commit ce5061e107f743e52b23445fd97fcf60d8160ec6. 
						
						
					 
					
						2014-07-04 10:04:04 +05:30 
						 
				 
			
				
					
						
							
							
								Damodar Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							ce5061e107 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6834 : 3. Some description changes words like CloudStack etc 4. Change Default installation location if possible include version number 5. Mysql Connector Installer along with other dependecies 6. Add run Service Checkbox 7. Add ReadMe checkbox  
						
						... 
						
						
						
						Signed-off-by: Koushik Das <koushik@apache.org> 
						
						
					 
					
						2014-07-03 17:43:00 +05:30 
						 
				 
			
				
					
						
							
							
								Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							c79ab570b0 
							
						 
					 
					
						
						
							
							Revert "CLOUDSTACK-6967: Initial OVM3 drop"  
						
						... 
						
						
						
						This reverts commit 8a485b9b59e4108e862022baf7477f768380b325. 
						
						
					 
					
						2014-06-24 10:24:01 +02:00 
						 
				 
			
				
					
						
							
							
								Funs 
							
						 
					 
					
						
						
						
						
							
						
						
							8a485b9b59 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6967: Initial OVM3 drop  
						
						... 
						
						
						
						Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
(cherry picked from commit ed47763e2525a21fa4578d199492462d0fb1c7ef)
Conflicts:
	api/src/com/cloud/network/NetworkService.java
	api/src/org/apache/cloudstack/api/ApiConstants.java
	api/src/org/apache/cloudstack/api/command/admin/usage/AddTrafficTypeCmd.java
	engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotObject.java
	plugins/pom.xml
	server/src/com/cloud/network/NetworkServiceImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/test/com/cloud/vpc/MockNetworkManagerImpl.java
	ui/scripts/docs.js 
						
						
					 
					
						2014-06-23 12:39:10 +02:00 
						 
				 
			
				
					
						
							
							
								Murali Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							cdb3dc97b5 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6749: [OVS] xe network-param-get with  
						
						... 
						
						
						
						param-key=is-ovs-vpc-distributed-vr-network alway returns error
fixing unnecessary errors in the logs 
						
						
					 
					
						2014-06-13 16:02:31 +05:30 
						 
				 
			
				
					
						
							
							
								Damodar Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							0f2c66e6c9 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6834: [Windows] 1. Added Port to the wizard to capture input from the admin.  
						
						... 
						
						
						
						Signed-off-by: Koushik Das <koushik@apache.org> 
						
						
					 
					
						2014-06-12 12:37:00 +05:30 
						 
				 
			
				
					
						
							
							
								Damodar Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							23280a47b8 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6702 : [Windows]Due to Progress bar changes mysql path was not getting read. Fixing the same.  
						
						... 
						
						
						
						Signed-off-by: Abhinandan Prateek <aprateek@apache.org> 
						
						
					 
					
						2014-06-11 11:25:02 +05:30 
						 
				 
			
				
					
						
							
							
								Tim Mackey 
							
						 
					 
					
						
						
						
						
							
						
						
							a8212d9ef4 
							
						 
					 
					
						
						
							
							Cleanup of Xen and XenServer terms. Cloned xen plugin creating a xenserver plugin, then removed xen plugin  
						
						... 
						
						
						
						Signed-off-by: Tim Mackey <tmackey@gmail.com>
Signed-off-by: Sebastien Goasguen <runseb@gmail.com> 
						
						
					 
					
						2014-06-07 04:50:23 -04:00 
						 
				 
			
				
					
						
							
							
								Damodar Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							603eab751a 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6701, CLOUDSTACK-6702:  
						
						... 
						
						
						
						1. Integrate System Seed Template into MSI Installer
2. Added progress bar status messages for custom actions at needed places.
Signed-off-by: Abhinandan Prateek <aprateek@apache.org> 
						
						
					 
					
						2014-06-04 12:23:33 +05:30 
						 
				 
			
				
					
						
							
							
								Damodar Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							8a210b50fb 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6702: Move all titles and descriptions to a property file or move to build properties  
						
						... 
						
						
						
						Signed-off-by: Abhinandan Prateek <aprateek@apache.org> 
						
						
					 
					
						2014-05-28 16:10:42 +05:30 
						 
				 
			
				
					
						
							
							
								Damodar Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							ce247a5592 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6700 : Adding optionstheme.xml to include selectable options.  
						
						... 
						
						
						
						Signed-off-by: Abhinandan Prateek <aprateek@apache.org> 
						
						
					 
					
						2014-05-23 17:45:50 +05:30 
						 
				 
			
				
					
						
							
							
								Damodar Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							8f98cc304e 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6700 : Give Option to install or not MySql Server along with Main Installer on the same server.  
						
						... 
						
						
						
						Signed-off-by: Abhinandan Prateek <aprateek@apache.org> 
						
						
					 
					
						2014-05-23 16:25:38 +05:30 
						 
				 
			
				
					
						
							
							
								Damodar Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							61c765b230 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6563: Integrating setuptools for python into MSI  
						
						... 
						
						
						
						Signed-off-by: Abhinandan Prateek <aprateek@apache.org> 
						
						
					 
					
						2014-05-20 14:57:44 +05:30 
						 
				 
			
				
					
						
							
							
								Damodar Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							aca7606a40 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6563: Integrating dependencies as part of MSI installer so that those will get installed along with cloud stack installation  
						
						
						
						
					 
					
						2014-05-16 10:50:32 +05:30 
						 
				 
			
				
					
						
							
							
								Murali Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							9105c779e9 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6685: OVS distributed firewall: source CIDR mismatch while  
						
						... 
						
						
						
						populating ingress & egress network ACL
fix ensures propoer values for nw_src and nw_dst are popoluated
depending on the ingress or egress acl 
						
						
					 
					
						2014-05-15 16:44:30 +05:30 
						 
				 
			
				
					
						
							
							
								Murali Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							63f6888588 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6668: OVS distributed routing: ensure bridge is deleted when  
						
						... 
						
						
						
						last VM from the VPC is deleted on a host
OVS distributed routing: ensure bridge is deleted when last VM from the
VPC is deleted on a host. This fix ensures that bridge is
destroyed. 
						
						
					 
					
						2014-05-14 16:41:56 +05:30 
						 
				 
			
				
					
						
							
							
								Harikrishna Patnala 
							
						 
					 
					
						
						
						
						
							
						
						
							807b6d2c4c 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6544: [Automation] Failed to create template for ROOT volume in Xen, with Exception: callHostPlugin failed  
						
						
						
						
					 
					
						2014-05-08 15:59:39 +05:30 
						 
				 
			
				
					
						
							
							
								Murali Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							55111e2284 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6609: OVS distributed routing: ensure tunnels are created if  
						
						... 
						
						
						
						not created already when OvsVpcPhysicalTopologyConfigCommand update is
recived
Currently if the tunnel creation fails, there is no retry logic. Fix
ensures OvsVpcPhysicalTopologyConfigCommand updates as an opputiunity to ensure
proper tunnels are established between the hosts. 
						
						
					 
					
						2014-05-08 15:58:16 +05:30 
						 
				 
			
				
					
						
							
							
								Murali Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							2df5df1b68 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6592: OVS distributed routing: make populate flooding rules  
						
						... 
						
						
						
						transactional
creats a file with all openflow rules updates and using ovs-ofctl file
option updates the brige in one go 
						
						
					 
					
						2014-05-07 20:05:32 +05:30 
						 
				 
			
				
					
						
							
							
								Murali Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							9e98cbf1c1 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6564: OVS distributed routing: use file based OF rule updates  
						
						... 
						
						
						
						use ovs-ofctl replace flows by file name option to update the OF rules
instead of sequenetially configuring the rules. 
						
						
					 
					
						2014-05-02 18:54:30 +05:30