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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Edison Su
							
						 
					 | 
					
						
						
						
						
							
						
						
							c6e84374cc
							
						
					 | 
					
						
						
							
							direct boot info to vga console instead of serial console for user vm template
						
						
						
						
						
						
					 | 
					
						2011-02-15 18:04:24 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								nit
							
						 
					 | 
					
						
						
						
						
							
						
						
							e901ccfe07
							
						
					 | 
					
						
						
							
							bug 8498:  Make osTypeId optional. Introdue a new OS type None to be shown for non bootable ISOs. Add check that when the ISO is bootable a valid osTypeId gets passed
						
						
						
						
						
						
					 | 
					
						2011-02-11 18:44:26 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								nit
							
						 
					 | 
					
						
						
						
						
							
						
						
							5469916060
							
						
					 | 
					
						
						
							
							bug 7522 : Extract ISO/Template - By default these entities wouldnt be extractable, GLOBAL ADMINS - always allowed to extract, OTHERS - allowed to extract if - 1) Its own template and extractable=true 2) Its not its own template but public=true and extractable=true.
						
						
						
						
						
						
						
						status 7522: resolved fixed 
						
						
					 | 
					
						2011-02-04 17:51:42 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								abhishek
							
						 
					 | 
					
						
						
						
						
							
						
						
							5f9e379327
							
						
					 | 
					
						
						
							
							updating md5 checksums for new system vm templates
						
						
						
						
						
						
					 | 
					
						2011-02-02 12:35:29 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								abhishek
							
						 
					 | 
					
						
						
						
						
							
						
						
							5a008fb410
							
						
					 | 
					
						
						
							
							bug 8212: applying patch
						
						
						
						
						
						
						
						status 8212: resolved fixed 
						
						
					 | 
					
						2011-01-28 15:27:16 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								abhishek
							
						 
					 | 
					
						
						
						
						
							
						
						
							e13e136f07
							
						
					 | 
					
						
						
							
							bug 8212: applying patch
						
						
						
						
						
						
						
						status 8212: resolved fixed 
						
						
					 | 
					
						2011-01-28 15:21:20 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								nit
							
						 
					 | 
					
						
						
						
						
							
						
						
							1bc05b8791
							
						
					 | 
					
						
						
							
							bug 8142: Making SystemVM and base CentOS template names consistent.
						
						
						
						
						
						
						
						status 8142 : resolved fixed 
						
						
					 | 
					
						2011-01-24 18:24:20 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								edison
							
						 
					 | 
					
						
						
						
						
							
						
						
							882fe2e213
							
						
					 | 
					
						
						
							
							fix vmware template url
						
						
						
						
						
						
					 | 
					
						2010-12-22 11:04:28 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								anthony
							
						 
					 | 
					
						
						
						
						
							
						
						
							57de81983f
							
						
					 | 
					
						
						
							
							add XenServer 5.6 FP1 specific guest os type
						
						
						
						
						
						
					 | 
					
						2010-12-20 15:47:57 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								edison
							
						 
					 | 
					
						
						
						
						
							
						
						
							6c9d3da4fd
							
						
					 | 
					
						
						
							
							bug 7500, 7447: add external url for template download
						
						
						
						
						
						
						
						status 7500: resolved fixed
status 7447: resolved fixed 
						
						
					 | 
					
						2010-12-20 11:19:53 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Kelven Yang
							
						 
					 | 
					
						
						
						
						
							
						
						
							3866926598
							
						
					 | 
					
						
						
							
							remove hard-code of vcenter server record from template.sql
						
						
						
						
						
						
					 | 
					
						2010-11-18 11:07:10 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Kelven Yang
							
						 
					 | 
					
						
						
						
						
							
						
						
							e02a8c9d9f
							
						
					 | 
					
						
						
							
							Support for Chiradeep's new template
						
						
						
						
						
						
					 | 
					
						2010-11-05 18:37:29 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								edison
							
						 
					 | 
					
						
						
						
						
							
						
						
							da56df0604
							
						
					 | 
					
						
						
							
							add default vmware template
						
						
						
						
						
						
					 | 
					
						2010-11-03 13:45:49 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								edison
							
						 
					 | 
					
						
						
						
						
							
						
						
							50cf96fa61
							
						
					 | 
					
						
						
							
							remove unused vmware template
						
						
						
						
						
						
					 | 
					
						2010-11-02 19:46:34 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Kelven Yang
							
						 
					 | 
					
						
						
						
						
							
						
						
							2c919c5c01
							
						
					 | 
					
						
						
							
							Make unique name conforming with the name generated in template installation for routing template, some other minor fixes
						
						
						
						
						
						
					 | 
					
						2010-10-15 16:36:02 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Kelven Yang
							
						 
					 | 
					
						
						
						
						
							
						
						
							f6e0d2dd41
							
						
					 | 
					
						
						
							
							Make system VM work on vmware
						
						
						
						
						
						
					 | 
					
						2010-10-14 17:23:13 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								edison
							
						 
					 | 
					
						
						
						
						
							
						
						
							e5c9384a3a
							
						
					 | 
					
						
						
							
							default routing template uuidname is changed to "routing-template-id", to make it work with installrtng.sh
						
						
						
						
						
						
					 | 
					
						2010-10-07 16:34:14 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Kelven Yang
							
						 
					 | 
					
						
						
						
						
							
						
						
							d307b86b07
							
						
					 | 
					
						
						
							
							Temporarily add a blank system vm for vmware testing, explcitly check the ticket info in console access URL
						
						
						
						
						
						
					 | 
					
						2010-10-06 17:36:13 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								edison
							
						 
					 | 
					
						
						
						
						
							
						
						
							139ff273ff
							
						
					 | 
					
						
						
							
							fix systemvm template for kvm, using chiradeep's latest debian template
						
						
						
						
						
						
					 | 
					
						2010-10-05 20:41:39 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								edison
							
						 
					 | 
					
						
						
						
						
							
						
						
							ad1ef80459
							
						
					 | 
					
						
						
							
							Now we have multiple routing template and buitin templates now, refactor template download code, that can handle it.
						
						
						
						
						
						
						
						Basically, change the meaning of type field in template table: SYSTEM means sytem vm template, BUILIIN means buildin templates. 
						
						
					 | 
					
						2010-09-29 18:41:55 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Kelven Yang
							
						 
					 | 
					
						
						
						
						
							
						
						
							b7efa12d59
							
						
					 | 
					
						
						
							
							Fix corrupted eclipse project settings, schema fixes and updated template download url
						
						
						
						
						
						
					 | 
					
						2010-09-29 18:41:54 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								edison
							
						 
					 | 
					
						
						
						
						
							
						
						
							ccf629360a
							
						
					 | 
					
						
						
							
							Sometimes, the permission of secondary-stoarage/templates is 755, no-writable.
						
						
						
						
						
						
						
						Fix it by "chmod 777 -R" for secondary storage 
						
						
					 | 
					
						2010-09-29 18:41:54 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								edison
							
						 
					 | 
					
						
						
						
						
							
						
						
							9e0f57bc0e
							
						
					 | 
					
						
						
							
							change code for new UI
						
						
						
						
						
						
					 | 
					
						2010-09-29 18:40:52 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								edison
							
						 
					 | 
					
						
						
						
						
							
						
						
							8943cc6745
							
						
					 | 
					
						
						
							
							create volume
						
						
						
						
						
						
						
						Conflicts:
	api/src/com/cloud/vm/VmCharacteristics.java
	core/src/com/cloud/dc/ClusterVO.java
	core/src/com/cloud/server/ManagementServer.java
	server/src/com/cloud/network/NetworkManager.java
	server/src/com/cloud/storage/allocator/AbstractStoragePoolAllocator.java 
						
						
					 | 
					
						2010-09-29 18:40:51 -07:00 | 
					
					
						
						
							
							
							
						
					 |