Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							70ef0788c9 
							
						 
					 
					
						
						
							
							CLOUDSTACK-9408: Fix download urls in sql and scripts  
						
						... 
						
						
						
						This fixes the agreed upon url on download.cloudstack.org in various
sql files and misc scripts.
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> 
						
						
					 
					
						2017-04-20 12:33:33 +05:30 
						 
				 
			
				
					
						
							
							
								Abhinandan Prateek 
							
						 
					 
					
						
						
						
						
							
						
						
							6a20dd4ead 
							
						 
					 
					
						
						
							
							CLOUDSTACK-8165: updating guest os id for xen template to corresponding 64 bit as default template is 64 bit  
						
						
						
						
					 
					
						2015-01-19 16:03:56 +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 
						 
				 
			
				
					
						
							
							
								edison 
							
						 
					 
					
						
						
						
						
							
						
						
							7b9d0d3fe5 
							
						 
					 
					
						
						
							
							mischanged default user vm template url for xen  
						
						
						
						
					 
					
						2014-03-28 16:24:14 -07:00 
						 
				 
			
				
					
						
							
							
								edison 
							
						 
					 
					
						
						
						
						
							
						
						
							bd752c2ec0 
							
						 
					 
					
						
						
							
							add md5sum for xen/kvm system vm template  
						
						
						
						
					 
					
						2014-03-28 16:23:59 -07:00 
						 
				 
			
				
					
						
							
							
								edison 
							
						 
					 
					
						
						
						
						
							
						
						
							caedc78142 
							
						 
					 
					
						
						
							
							update xen/kvm system vm template download url, and update the os type to 64bit  
						
						
						
						
					 
					
						2014-03-28 16:23:51 -07:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							b484b48201 
							
						 
					 
					
						
						
							
							Provide separate option for Windows Server 2012 R2 as  
						
						... 
						
						
						
						an OS type when registering template. 
						
						
					 
					
						2014-02-25 16:09:29 -08:00 
						 
				 
			
				
					
						
							
							
								Wido den Hollander 
							
						 
					 
					
						
						
						
						
							
						
						
							abf3c055c2 
							
						 
					 
					
						
						
							
							templates: Add FreeBSD 10 template  
						
						... 
						
						
						
						With VirtIO enabled on KVM. FreeBSD 10 supports VirtIO for both the
network and the disks. This frees us from IDE and E1000 which should
also improve performance. 
						
						
					 
					
						2014-02-25 14:56:24 +01:00 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							b05f19eb9e 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4872:VM provisioned using a registered Windows Server 2012  
						
						... 
						
						
						
						template will show as other os in VCenter. 
						
						
					 
					
						2013-10-15 13:56:13 -07:00 
						 
				 
			
				
					
						
							
							
								Devdeep Singh 
							
						 
					 
					
						
						
						
						
							
						
						
							d9d7cbd5b4 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4268: Guest OS category of Other Ubuntu 32 bit is different in a fresh setup and  
						
						... 
						
						
						
						a setup upgraded from 4.1 to 4.2. Fixed the category id for Ubuntu on clean setup. Also made
change to address the problem for upgrade from 2.x. 
						
						
					 
					
						2013-08-13 15:36:55 +05:30 
						 
				 
			
				
					
						
							
							
								Sanjay Tripathi 
							
						 
					 
					
						
						
						
						
							
						
						
							d6ebcd1924 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4187: 2.2.1 - 4.2 Upgrade: Few Guest OS Types information is inconsistent on the Upgraded Setup when compared with the fresh 4.2 Installation.  
						
						
						
						
					 
					
						2013-08-09 15:27:56 +05:30 
						 
				 
			
				
					
						
							
							
								Sanjay Tripathi 
							
						 
					 
					
						
						
						
						
							
						
						
							3de6cdb4f9 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4062: SLES 11 SP2, SLES 11 SP3, CENTOS 6.4, RHEL 6.3, RHEL 6.4 OS type missing from OS Type drop down list when registering template.  
						
						... 
						
						
						
						Also added the support of different versions of SLES, RHEL, Oracle Linux guest OS which was not there in the list. 
						
						
					 
					
						2013-08-07 17:15:32 +05:30 
						 
				 
			
				
					
						
							
							
								Sanjay Tripathi 
							
						 
					 
					
						
						
						
						
							
						
						
							d9568c89d7 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4101: Update the Xenserver template/checksum in template.sql to the one verified.  
						
						
						
						
					 
					
						2013-08-07 17:15:22 +05:30 
						 
				 
			
				
					
						
							
							
								Sanjay Tripathi 
							
						 
					 
					
						
						
						
						
							
						
						
							0b00e13e24 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3723: System VM Template for XenServer has wrong guest OS type Information on the Database  
						
						... 
						
						
						
						Also added the debian 7 to debian 6 mapping in CitrixHelper file
to support the debian 7 template in XS 6.0, 6.0.2, 6,1 etc. 
						
						
					 
					
						2013-08-07 12:57:11 +05:30 
						 
				 
			
				
					
						
							
							
								Abhinandan Prateek 
							
						 
					 
					
						
						
						
						
							
						
						
							cf6e125d81 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3480: updated md5 checksum  
						
						
						
						
					 
					
						2013-07-27 17:09:40 +05:30 
						 
				 
			
				
					
						
							
							
								Abhinandan Prateek 
							
						 
					 
					
						
						
						
						
							
						
						
							f177f733f1 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3480: updated the 4.2 templates download location  
						
						
						
						
					 
					
						2013-07-27 11:41:47 +05:30 
						 
				 
			
				
					
						
							
							
								Sanjay Tripathi 
							
						 
					 
					
						
						
						
						
							
						
						
							d6368872a7 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3723: System VM Template for XenServer has wrong guest OS type Information on the Database.  
						
						... 
						
						
						
						This commit also contains the guestOS addition of new CentOS releases
supported by XenServer 6.2
Signed-off-by: Abhinandan Prateek <aprateek@apache.org> 
						
						
					 
					
						2013-07-27 11:11:59 +05:30 
						 
				 
			
				
					
						
							
							
								Abhinandan Prateek 
							
						 
					 
					
						
						
						
						
							
						
						
							59d7c94247 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3136: added Centsor 6.3 and Ubuntu 11.04 guest OS for Xen 6.1  
						
						
						
						
					 
					
						2013-06-22 16:04:55 +05:30 
						 
				 
			
				
					
						
							
							
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							c11dbad9c9 
							
						 
					 
					
						
						
							
							merge master  
						
						
						
						
					 
					
						2013-05-11 15:28:43 +05:30 
						 
				 
			
				
					
						
							
							
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							8761a1d0db 
							
						 
					 
					
						
						
							
							CLOUDSTACK-1373: Fix regression in db-schema due to recent branch merges  
						
						... 
						
						
						
						Missed a few lines, did someone mention something about testing
recently? 
						
						
					 
					
						2013-02-22 22:30:28 +01:00 
						 
				 
			
				
					
						
							
							
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							1ad363e44a 
							
						 
					 
					
						
						
							
							CLOUDSTACK-1373: Fix regression in db-schema due to recent branch merges  
						
						... 
						
						
						
						related to commit 5f8a2ee9be490f7ecf7ada2e0847e76ac5b81fed. The field image_data_store_id should not be used in templates.sql as  it does not exist yet. Should be filled during the upgrade from 4.1 to 4.2, but i'm leaving that to Edison.
Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com> 
						
						
					 
					
						2013-02-22 16:22:17 +01:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							a22403edcd 
							
						 
					 
					
						
						
							
							squash changes into one giant patch  
						
						
						
						
					 
					
						2013-02-21 11:22:48 -08:00 
						 
				 
			
				
					
						
							
							
								Wido den Hollander 
							
						 
					 
					
						
						
						
						
							
						
						
							95222cdb6d 
							
						 
					 
					
						
						
							
							Templates: Add Ubuntu 12.04 to the templates  
						
						... 
						
						
						
						Although I still think the templates aren't well maintained, I just
added 12.04 since this is an LTS and people probably want it in the
list of templates.
This system should be more generic I think though. 
						
						
					 
					
						2013-01-15 13:25:48 +01:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							d22229eb9d 
							
						 
					 
					
						
						
							
							Remove updateUuids code in ConfigurationServerImpl (which is not the  
						
						... 
						
						
						
						right approach to populate uuid column since it will impact upgrade as
well), and populate UUID column in seed data sql script.
Signed-off-by: Min Chen <min.chen@citrix.com> 
						
						
					 
					
						2013-01-08 17:12:14 -08:00 
						 
				 
			
				
					
						
							
							
								Mice Xia 
							
						 
					 
					
						
						
						
						
							
						
						
							dd07d1598f 
							
						 
					 
					
						
						
							
							Fix Bug CloudStack-9 can not change OS preference from OS to none  
						
						
						
						
					 
					
						2012-09-04 20:51:03 +08:00 
						 
				 
			
				
					
						
							
							
								Abhinandan Prateek 
							
						 
					 
					
						
						
						
						
							
						
						
							cebd9444be 
							
						 
					 
					
						
						
							
							fixing the xen systemvm template guest os to reflect the right one  
						
						
						
						
					 
					
						2012-08-23 12:25:46 +05:30 
						 
				 
			
				
					
						
							
							
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							3a6d890741 
							
						 
					 
					
						
						
							
							Commit for review-request:  https://reviews.apache.org/r/6458/  
						
						
						
						
					 
					
						2012-08-08 17:18:31 -07:00 
						 
				 
			
				
					
						
							
							
								David Nalley 
							
						 
					 
					
						
						
						
						
							
						
						
							fc3ac862dc 
							
						 
					 
					
						
						
							
							applying the commits from Chip Childers licensing cleanup  
						
						
						
						
					 
					
						2012-06-26 10:44:04 -04:00 
						 
				 
			
				
					
						
							
							
								Abhi 
							
						 
					 
					
						
						
						
						
							
						
						
							69c4438df3 
							
						 
					 
					
						
						
							
							bug CS-14515: adding centos 5.7 to supported os, supported in xen 6.0.2  
						
						
						
						
					 
					
						2012-05-03 12:32:17 +05:30 
						 
				 
			
				
					
						
							
							
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							2f634c0913 
							
						 
					 
					
						
						
							
							Switch to Apache license  
						
						
						
						
					 
					
						2012-04-03 04:50:05 -07:00 
						 
				 
			
				
					
						
							
							
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							2c27de0042 
							
						 
					 
					
						
						
							
							bug 12974: Update system template info in templates.sql  
						
						... 
						
						
						
						status 12974: resolved fixed
Reviewed-by: Frank Zhang 
						
						
					 
					
						2012-02-21 13:50:17 -08:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							48943f52bf 
							
						 
					 
					
						
						
							
							retire centos5.3  
						
						... 
						
						
						
						introduce centos5.6 with xs-tools 
						
						
					 
					
						2012-01-24 20:09:00 -08:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							99cbef154d 
							
						 
					 
					
						
						
							
							bug 13187: remove duplicate Red Hat Enterprise Linux 6 os type  
						
						... 
						
						
						
						status 13187: resolved fixed 
						
						
					 
					
						2012-01-20 10:54:55 -08:00 
						 
				 
			
				
					
						
							
							
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							9c1b8ef673 
							
						 
					 
					
						
						
							
							add copyright delcartion to all sql files  
						
						
						
						
					 
					
						2012-01-11 17:31:10 -08:00 
						 
				 
			
				
					
						
							
							
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							fb596aa003 
							
						 
					 
					
						
						
							
							bug 12974: Update system template in template.sql  
						
						
						
						
					 
					
						2012-01-10 15:01:28 -08:00 
						 
				 
			
				
					
						
							
							
								Abhinandan Prateek 
							
						 
					 
					
						
						
						
						
							
						
						
							3e5e36e767 
							
						 
					 
					
						
						
							
							bug 12583: updated scripts  
						
						
						
						
					 
					
						2011-12-20 13:24:52 +05:30 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							e60f356f62 
							
						 
					 
					
						
						
							
							set the cpu weight based on cpu * cores  
						
						
						
						
					 
					
						2011-12-15 15:13:33 -08:00 
						 
				 
			
				
					
						
							
							
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							cb3c2699b7 
							
						 
					 
					
						
						
							
							Add Solaris support for Ovm  
						
						... 
						
						
						
						Conflicts:
	setup/db/templates.sql 
						
						
					 
					
						2011-10-25 18:12:18 -07:00 
						 
				 
			
				
					
						
							
							
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							590ce6d78a 
							
						 
					 
					
						
						
							
							bug 11774: refactor guest OS mapping to avoid conflicts with changes in master branch  
						
						
						
						
					 
					
						2011-10-20 17:38:57 -07:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							9f2eaca6cb 
							
						 
					 
					
						
						
							
							Support XenServer 6.0 beta  
						
						
						
						
					 
					
						2011-07-20 16:47:48 -07:00 
						 
				 
			
				
					
						
							
							
								Murali Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							5d3fae2fe4 
							
						 
					 
					
						
						
							
							bug 9250:Need a new Guest OS type for XenServer: "Other PV"  
						
						... 
						
						
						
						adding new guest OS type "Other PV" 
						
						
					 
					
						2011-05-16 19:53:12 +05:30 
						 
				 
			
				
					
						
							
							
								Murali Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							1b251a5fc8 
							
						 
					 
					
						
						
							
							Bug 4061: support for Microsoft Hyper-V changes- part 1  
						
						
						
						
					 
					
						2011-03-30 18:48:51 +05:30 
						 
				 
			
				
					
						
							
							
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							a8cc285ca9 
							
						 
					 
					
						
						
							
							bug 8934: set correct guest_type for default Xen Centos template. DB upgrade script is also updated.  
						
						... 
						
						
						
						status 8934: resolved fixed 
						
						
					 
					
						2011-03-25 16:05:06 -07:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							adbd20ca5a 
							
						 
					 
					
						
						
							
							bug 8655: add security group for direct tagged network  
						
						
						
						
					 
					
						2011-02-23 15:53:14 -05:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							8887b6c443 
							
						 
					 
					
						
						
							
							add correct mdsum  
						
						
						
						
					 
					
						2011-02-15 18:13:50 -05:00