vetrivelc 
							
						 
					 
					
						
						
						
						
							
						
						
							66e805cba9 
							
						 
					 
					
						
						
							
							Fixes: Hardcoded strings externalized from various JS files.  
						
						... 
						
						
						
						Signed-off-by: vetrivelc <vetrivel.chinnasamy@citrix.com> 
						
						
					 
					
						2014-11-21 08:02:49 -08:00 
						 
				 
			
				
					
						
							
							
								David Bierce 
							
						 
					 
					
						
						
						
						
							
						
						
							83656a6ea8 
							
						 
					 
					
						
						
							
							Occasionally the while loop can exit with no data (Probably recieving an EOF) before receiveing CMDline data from the certial port. Continue looping until cmdline is populated  
						
						... 
						
						
						
						Signed-off-by: Edison Su <sudison@gmail.com> 
						
						
					 
					
						2014-11-20 11:00:09 -08:00 
						 
				 
			
				
					
						
							
							
								David Bierce 
							
						 
					 
					
						
						
						
						
							
						
						
							50d756e87d 
							
						 
					 
					
						
						
							
							Occasionally the while loop can exit with no data (Probably recieving an EOF) before receiveing CMDline data from the certial port. Continue looping until cmdline is populated  
						
						... 
						
						
						
						Signed-off-by: Edison Su <sudison@gmail.com> 
						
						
					 
					
						2014-11-20 10:58:35 -08:00 
						 
				 
			
				
					
						
							
							
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							50b262e02a 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7944: Ensure ipv6 is enabled in sysctl.conf  
						
						... 
						
						
						
						The booting sequence result in change of IPv6 related sysctl options was
overrided by sysctl.conf which is loaded later.
So this patch would patch sysctl.conf in VR as well, ensure IPv6 would be
enabled during booting period otherwise the network setup may not work, result
in IPv6 VM deployment failure. 
						
						
					 
					
						2014-11-19 14:50:03 -08:00 
						 
				 
			
				
					
						
							
							
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							bb352da302 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7944: Ensure ipv6 is enabled in sysctl.conf  
						
						... 
						
						
						
						The booting sequence result in change of IPv6 related sysctl options was
overrided by sysctl.conf which is loaded later.
So this patch would patch sysctl.conf in VR as well, ensure IPv6 would be
enabled during booting period otherwise the network setup may not work, result
in IPv6 VM deployment failure. 
						
						
					 
					
						2014-11-19 14:49:18 -08:00 
						 
				 
			
				
					
						
							
							
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							fd03091c81 
							
						 
					 
					
						
						
							
							Revert "CLOUDSTACK-7821: Fix OSX cannot connect to VPN due to wrongly declaim ENCAPSULATION_MODE_UDP_TRANSPORT_RFC"  
						
						... 
						
						
						
						This reverts commit e1c788ca3c69a8c8c2041c7b106f76fa49332888.
This breaks Windows 7 client. 
						
						
					 
					
						2014-11-14 11:44:53 -08:00 
						 
				 
			
				
					
						
							
							
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							2d3b3376e3 
							
						 
					 
					
						
						
							
							Revert "CLOUDSTACK-7821: Fix OSX cannot connect to VPN due to wrongly declaim ENCAPSULATION_MODE_UDP_TRANSPORT_RFC"  
						
						... 
						
						
						
						This reverts commit e1c788ca3c69a8c8c2041c7b106f76fa49332888.
It breaks Windows 7 client. 
						
						
					 
					
						2014-11-14 11:43:03 -08:00 
						 
				 
			
				
					
						
							
							
								Sanjay Tripathi 
							
						 
					 
					
						
						
						
						
							
						
						
							7f2219bcbb 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7904: EN-UK: CentOS 6.5 GUI: Key translation fails for some  EN- UK keyboard keys.  
						
						
						
						
					 
					
						2014-11-13 19:16:02 +05:30 
						 
				 
			
				
					
						
							
							
								Joris van Lieshout 
							
						 
					 
					
						
						
						
						
							
						
						
							1cc733bfd5 
							
						 
					 
					
						
						
							
							Logrotate is called from crontab. Debian crontab does not include everything in it's path. Therefore reference to these bins need to be absoluut.  
						
						... 
						
						
						
						Signed-off-by: Daan Hoogland <daan@onecht.net> 
						
						
					 
					
						2014-11-09 13:18:08 +01:00 
						 
				 
			
				
					
						
							
							
								Joris van Lieshout 
							
						 
					 
					
						
						
						
						
							
						
						
							1e1cc11d9a 
							
						 
					 
					
						
						
							
							Logrotate is called from crontab. Debian crontab does not include everything in it's path. Therefore reference to these bins need to be absoluut.  
						
						... 
						
						
						
						Signed-off-by: Daan Hoogland <daan@onecht.net> 
						
						
					 
					
						2014-11-09 13:13:56 +01:00 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							a014617085 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7855: NIC3 should set MTU and not NIC1 for storage network nic  
						
						... 
						
						
						
						The fix also persists the configuration in /etc/network/interfaces
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> 
						
						
					 
					
						2014-11-06 18:21:32 +05:30 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							c8ad4d15fd 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7855: NIC3 should set MTU and not NIC1 for storage network nic  
						
						... 
						
						
						
						The fix also persists the configuration in /etc/network/interfaces
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> 
						
						
					 
					
						2014-11-06 18:19:11 +05:30 
						 
				 
			
				
					
						
							
							
								Sanjay Tripathi 
							
						 
					 
					
						
						
						
						
							
						
						
							e6533b3684 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7852: EN-US, SC: CentOS CLI & Windows OS: Key translation  
						
						... 
						
						
						
						fails on the Numeric Del. key for US 101 keyboard. 
						
						
					 
					
						2014-11-06 13:33:57 +05:30 
						 
				 
			
				
					
						
							
							
								Sanjay Tripathi 
							
						 
					 
					
						
						
						
						
							
						
						
							04a6063ba8 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7852: EN-US, SC: CentOS CLI & Windows OS: Key translation  
						
						... 
						
						
						
						fails on the Numeric Del. key for US 101 keyboard. 
						
						
					 
					
						2014-11-06 13:32:09 +05:30 
						 
				 
			
				
					
						
							
							
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							c15ed74f63 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7841: Gracefully reload haproxy config  
						
						... 
						
						
						
						The old way would disconnect all the existing connections through haproxy when
reload the config.
This new way would ensure that all the existing connections would still alive
after reload the config. 
						
						
					 
					
						2014-11-04 16:41:46 -08:00 
						 
				 
			
				
					
						
							
							
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							4b3217fe57 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7841: Gracefully reload haproxy config  
						
						... 
						
						
						
						The old way would disconnect all the existing connections through haproxy when
reload the config.
This new way would ensure that all the existing connections would still alive
after reload the config. 
						
						
					 
					
						2014-11-04 16:40:47 -08:00 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							84e44a4dba 
							
						 
					 
					
						
						
							
							systemvm: Prefer TLS over SSL in apache, POODLE workaround (CVE20143566)  
						
						... 
						
						
						
						Just prefer TLS over SSL in apache configuration in systemvm
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 88acc9bd53cbf6f8896d32576f916c20704a3403)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> 
						
						
					 
					
						2014-11-04 01:50:06 +05:30 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							88acc9bd53 
							
						 
					 
					
						
						
							
							systemvm: Prefer TLS over SSL in apache, POODLE workaround (CVE20143566)  
						
						... 
						
						
						
						Just prefer TLS over SSL in apache configuration in systemvm
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> 
						
						
					 
					
						2014-11-04 01:43:55 +05:30 
						 
				 
			
				
					
						
							
							
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							e1c788ca3c 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7821: Fix OSX cannot connect to VPN due to wrongly declaim ENCAPSULATION_MODE_UDP_TRANSPORT_RFC  
						
						... 
						
						
						
						OSX always declaims it's behind NAT no matter it's true or not, thus result in
confusion of openswan.
Add parameter "forceencaps=yes" to openswan to make sure non NAT VPN connection
from OSX can pass through. 
						
						
					 
					
						2014-10-30 17:24:57 -07:00 
						 
				 
			
				
					
						
							
							
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							03a43159d8 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7821: Fix OSX cannot connect to VPN due to wrongly declaim ENCAPSULATION_MODE_UDP_TRANSPORT_RFC  
						
						... 
						
						
						
						OSX always declaims it's behind NAT no matter it's true or not, thus result in
confusion of openswan.
Add parameter "forceencaps=yes" to openswan to make sure non NAT VPN connection
from OSX can pass through. 
						
						
					 
					
						2014-10-30 17:23:34 -07:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							9d5b7b73a2 
							
						 
					 
					
						
						
							
							MTU should be put on storage network: eth3, instead of eth1 Reviewed-by: Frank  
						
						
						
						
					 
					
						2014-10-30 02:45:46 -07:00 
						 
				 
			
				
					
						
							
							
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							4ebaf0a583 
							
						 
					 
					
						
						
							
							Bump master version to 4.6.0-SNAPSHOT after branching 4.5.0-SNAPSHOT  
						
						
						
						
					 
					
						2014-10-29 14:54:23 +01:00 
						 
				 
			
				
					
						
							
							
								Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							1de0cb7094 
							
						 
					 
					
						
						
							
							restore barematel work after merge  
						
						
						
						
					 
					
						2014-10-17 10:24:01 +02:00 
						 
				 
			
				
					
						
							
							
								Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							148efbb73f 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/4.5' into merge-master  
						
						... 
						
						
						
						Conflicts:
	engine/schema/src/com/cloud/upgrade/dao/Upgrade441to450.java
	plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalManagerImpl.java
	plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManager.java
	plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManagerImpl.java
	plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartServiceImpl.java
	plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
	setup/db/db/schema-441to450.sql
	test/integration/component/test_deploy_vgpu_vm.py
	tools/marvin/marvin/config/test_data.py 
						
						
					 
					
						2014-10-16 12:29:37 +02:00 
						 
				 
			
				
					
						
							
							
								Saksham Srivastava 
							
						 
					 
					
						
						
						
						
							
						
						
							b29d075108 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7657: cloud.log is being rotated by multiple rotation policies on SSVM and CPVM  
						
						... 
						
						
						
						(cherry picked from commit 3e02bfa74fc7ec0f26ad53fcc528e3f3b5e8f742) 
						
						
					 
					
						2014-10-13 00:13:25 -04:00 
						 
				 
			
				
					
						
							
							
								Sanjay Tripathi 
							
						 
					 
					
						
						
						
						
							
						
						
							d97ad972b4 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7373: Incorrect Japanese keyboard mapping with CentOS CLI and windows guestOS on VMware.  
						
						... 
						
						
						
						(cherry picked from commit bdf7d6530593db33636b2fecf18bb2cf4c61d21f) 
						
						
					 
					
						2014-10-13 00:06:13 -04:00 
						 
				 
			
				
					
						
							
							
								Saksham Srivastava 
							
						 
					 
					
						
						
						
						
							
						
						
							cd3df842f2 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7631: Log rotate on VR may fail as /etc/init.d/rsyslog does not anymore support reload option on debian wheezy  
						
						... 
						
						
						
						(cherry picked from commit 3a8c450890299ba02bcc245d962b87da0306b2e1) 
						
						
					 
					
						2014-10-12 23:55:42 -04:00 
						 
				 
			
				
					
						
							
							
								David Nalley 
							
						 
					 
					
						
						
						
						
							
						
						
							ac48aa8e0c 
							
						 
					 
					
						
						
							
							cleaning up some from a revert  
						
						
						
						
					 
					
						2014-10-12 23:30:04 -04:00 
						 
				 
			
				
					
						
							
							
								Frank Zhang 
							
						 
					 
					
						
						
						
						
							
						
						
							6dd3a91864 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6278  
						
						... 
						
						
						
						Baremetal Advanced Networking support
 fix baremetal-vr.py license header 
						
						
					 
					
						2014-10-06 16:07:51 -07:00 
						 
				 
			
				
					
						
							
							
								Frank Zhang 
							
						 
					 
					
						
						
						
						
							
						
						
							01dada100a 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6278  
						
						... 
						
						
						
						Baremetal Advanced Networking support 
						
						
					 
					
						2014-10-06 16:03:19 -07:00 
						 
				 
			
				
					
						
							
							
								Saksham Srivastava 
							
						 
					 
					
						
						
						
						
							
						
						
							3e02bfa74f 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7657: cloud.log is being rotated by multiple rotation policies on SSVM and CPVM  
						
						
						
						
					 
					
						2014-10-01 13:39:09 +05:30 
						 
				 
			
				
					
						
							
							
								Sanjay Tripathi 
							
						 
					 
					
						
						
						
						
							
						
						
							bdf7d65305 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7373: Incorrect Japanese keyboard mapping with CentOS CLI and windows guestOS on VMware.  
						
						
						
						
					 
					
						2014-09-29 11:54:57 +05:30 
						 
				 
			
				
					
						
							
							
								Saksham Srivastava 
							
						 
					 
					
						
						
						
						
							
						
						
							3a8c450890 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7631: Log rotate on VR may fail as /etc/init.d/rsyslog does not anymore support reload option on debian wheezy  
						
						
						
						
					 
					
						2014-09-25 15:59:08 +05:30 
						 
				 
			
				
					
						
							
							
								Frank Zhang 
							
						 
					 
					
						
						
						
						
							
						
						
							3e6817c878 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6278  
						
						... 
						
						
						
						Baremetal Advanced Networking support
    add missing license header to systemvm/patches/debian/config/etc/rc.local 
						
						
					 
					
						2014-09-22 14:44:14 -07:00 
						 
				 
			
				
					
						
							
							
								Frank Zhang 
							
						 
					 
					
						
						
						
						
							
						
						
							6155d3ecaa 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6278  
						
						... 
						
						
						
						Baremetal Advanced Networking support 
						
						
					 
					
						2014-09-22 13:57:32 -07:00 
						 
				 
			
				
					
						
							
							
								Frank Zhang 
							
						 
					 
					
						
						
						
						
							
						
						
							8b89494a35 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6278  
						
						... 
						
						
						
						Baremetal Advanced Networking support 
						
						
					 
					
						2014-09-18 16:54:37 -07: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 
						 
				 
			
				
					
						
							
							
								Bharat Kumar 
							
						 
					 
					
						
						
						
						
							
						
						
							29911dd2e1 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7376 passwd_server attempts to start but terminates with the exit code 137  
						
						... 
						
						
						
						Signed-off-by: Sheng Yang <sheng.yang@citrix.com> 
						
						
					 
					
						2014-09-17 09:28:44 -07:00 
						 
				 
			
				
					
						
							
							
								Sanjay Tripathi 
							
						 
					 
					
						
						
						
						
							
						
						
							4796cceb34 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7373: Incorrect Japanese keyboard mapping with CentOS CLI guestOS on VMware.  
						
						... 
						
						
						
						Fixed the jp keyboard issues for VMs deployed with keyboard=jp param. 
						
						
					 
					
						2014-09-15 16:16:45 +05:30 
						 
				 
			
				
					
						
							
							
								Jayapal 
							
						 
					 
					
						
						
						
						
							
						
						
							3cb6d4a4df 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7544: Fixed ip addr del issues in ipassoc  
						
						
						
						
					 
					
						2014-09-15 14:54:13 +05:30 
						 
				 
			
				
					
						
							
							
								Jayapal 
							
						 
					 
					
						
						
						
						
							
						
						
							b4f03a1339 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7517: loading ftp modules in VR  
						
						
						
						
					 
					
						2014-09-10 14:10:14 +05:30 
						 
				 
			
				
					
						
							
							
								Fred Clift 
							
						 
					 
					
						
						
						
						
							
						
						
							355eb72c7d 
							
						 
					 
					
						
						
							
							make virtual router /latest/.htaccess file be static - no longer dynamically generate it, remove code that managed the file previously  
						
						... 
						
						
						
						Signed-off-by: Sebastien Goasguen <runseb@gmail.com> 
						
						
					 
					
						2014-09-04 04:22:27 -04:00 
						 
				 
			
				
					
						
							
							
								Wido den Hollander 
							
						 
					 
					
						
						
						
						
							
						
						
							1499972804 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7405: Make the trailing slash conditional for meta-data requests  
						
						... 
						
						
						
						This should fix the cloud-init issues described in this issue. 
						
						
					 
					
						2014-08-25 14:13:09 +02:00 
						 
				 
			
				
					
						
							
							
								Sanjay Tripathi 
							
						 
					 
					
						
						
						
						
							
						
						
							1354605073 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7373: Incorrect Japanese keyboard mapping with CentOS CLI guestOS on VMware host.  
						
						... 
						
						
						
						This fix is to correct the JP keyboard mapping for VMs with windows and centOS GUI
and CLI OS on VMware hypervisor. Also fixed some known issues on centOS CLI on XS
hypervisor. Fix is not causing any regression. 
						
						
					 
					
						2014-08-20 14:34:28 +05:30 
						 
				 
			
				
					
						
							
							
								Joris van Lieshout 
							
						 
					 
					
						
						
						
						
							
						
						
							c90bf1231f 
							
						 
					 
					
						
						
							
							sysctl improvements. 1. ip_nonlocal_bind for smooth transition in case of a keepalived failover. 2. panic settings so that a vm dies in a way that ACS understands it's down. 3. also up the nf_conntrack limits.  
						
						... 
						
						
						
						Signed-off-by: Daan Hoogland <daan@onecht.net>
(cherry picked from commit 45deade1df171d9ae5562111bf011ee913ff9dc0)
Conflicts:
	systemvm/patches/debian/config/etc/sysctl.conf
(cherry picked from commit c4d1bf7f2426bfddd96ab9415fe793647e67a5a4) 
						
						
					 
					
						2014-08-14 14:11:33 +02:00 
						 
				 
			
				
					
						
							
							
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							2ff7b846fd 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7185: Change Apache2 log rotation policy to avoid memory leak  
						
						
						
						
					 
					
						2014-07-25 14:02:44 -07:00 
						 
				 
			
				
					
						
							
							
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							1ad1883b74 
							
						 
					 
					
						
						
							
							Add virtualbox support to cloud-early-config so we can use virtualbox for testing  
						
						
						
						
					 
					
						2014-07-14 15:34:14 +02:00 
						 
				 
			
				
					
						
							
							
								Jayapal 
							
						 
					 
					
						
						
						
						
							
						
						
							e0d4af5062 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7092: Disabled icmp redirects in VR  
						
						
						
						
					 
					
						2014-07-10 15:17:50 +05:30 
						 
				 
			
				
					
						
							
							
								Jayapal 
							
						 
					 
					
						
						
						
						
							
						
						
							2f1b40d2e8 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7028: Fixed adding route for additional public nic on fail over  
						
						
						
						
					 
					
						2014-07-01 15:16:27 +05:30 
						 
				 
			
				
					
						
							
							
								Jayapal 
							
						 
					 
					
						
						
						
						
							
						
						
							d5e686f2ec 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6997: Increase proc ip_conntrack_max  
						
						
						
						
					 
					
						2014-07-01 10:29:46 +05:30