anthony
							
						 
					 | 
					
						
						
						
						
							
						
						
							9be635367e
							
						
					 | 
					
						
						
							
							bug 10363 : cleanup vhd in secondary storage if creating private template fails
						
						
						
						
						
						
						
						status 10363 : resolved fixed
Conflicts:
	core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java 
						
						
					 | 
					
						2012-01-10 16:45:07 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								anthony
							
						 
					 | 
					
						
						
						
						
							
						
						
							fb8364ad0c
							
						
					 | 
					
						
						
							
							bug 10363 : cleanup vhd in secondary storage if backsnapshot fails
						
						
						
						
						
						
						
						Conflicts:
	core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java 
						
						
					 | 
					
						2012-01-10 15:51:13 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								anthony
							
						 
					 | 
					
						
						
						
						
							
						
						
							924953220b
							
						
					 | 
					
						
						
							
							bug 10363 : cleanup vhd in secondary storage if copy_vhd_to_secondarystorage fails
						
						
						
						
						
						
					 | 
					
						2012-01-10 15:07:49 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								anthony
							
						 
					 | 
					
						
						
						
						
							
						
						
							f964c4d227
							
						
					 | 
					
						
						
							
							bug 10363 : cleanup vhd in primary storage if download template to primary storage fails
						
						
						
						
						
						
						
						Conflicts:
	core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
	scripts/vm/hypervisor/xenserver/vmops 
						
						
					 | 
					
						2012-01-10 13:56:29 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								anthony
							
						 
					 | 
					
						
						
						
						
							
						
						
							c25cb29f10
							
						
					 | 
					
						
						
							
							remove nfs.py patch
						
						
						
						
						
						
					 | 
					
						2012-01-10 13:56:29 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sheng Yang
							
						 
					 | 
					
						
						
						
						
							
						
						
							59981f71c1
							
						
					 | 
					
						
						
							
							bug 12883: Fix numerous NETWORK_STAT related rule in iptables
						
						
						
						
						
						
						
						Also use script in the router for the execution.
status 12883: resolved fixed 
						
						
					 | 
					
						2012-01-09 20:04:45 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Naredula Janardhana Reddy
							
						 
					 | 
					
						
						
						
						
							
						
						
							6aa0560d37
							
						
					 | 
					
						
						
							
							bug 12917: security groups - icmp type/code validations.
						
						
						
						
						
						
					 | 
					
						2012-01-06 19:33:07 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chiradeep Vittal
							
						 
					 | 
					
						
						
						
						
							
						
						
							5aba3913bb
							
						
					 | 
					
						
						
							
							bug 12854: arp requests can also be used to poison arp caches
						
						
						
						
						
						
					 | 
					
						2012-01-05 18:01:19 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chiradeep Vittal
							
						 
					 | 
					
						
						
						
						
							
						
						
							f138d15efb
							
						
					 | 
					
						
						
							
							bug 12854: arp and ip antispoof independent of the order of vm start
						
						
						
						
						
						
					 | 
					
						2012-01-05 18:01:10 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chiradeep Vittal
							
						 
					 | 
					
						
						
						
						
							
						
						
							24894e2354
							
						
					 | 
					
						
						
							
							bug 11302: dont allow stuff like BPDUS, don't allow vms to connect to hypervisor
						
						
						
						
						
						
					 | 
					
						2011-12-29 17:35:24 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chiradeep Vittal
							
						 
					 | 
					
						
						
						
						
							
						
						
							4718f194ef
							
						
					 | 
					
						
						
							
							bug 12772: typo
						
						
						
						
						
						
					 | 
					
						2011-12-29 16:01:41 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chiradeep Vittal
							
						 
					 | 
					
						
						
						
						
							
						
						
							338aa3e2a8
							
						
					 | 
					
						
						
							
							accidental commit
						
						
						
						
						
						
					 | 
					
						2011-12-29 16:01:41 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chiradeep Vittal
							
						 
					 | 
					
						
						
						
						
							
						
						
							a51ee064ee
							
						
					 | 
					
						
						
							
							bug 11302: more efficient caching of keyword
						
						
						
						
						
						
					 | 
					
						2011-12-29 16:01:41 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chiradeep Vittal
							
						 
					 | 
					
						
						
						
						
							
						
						
							c05903b2d0
							
						
					 | 
					
						
						
							
							bug 11302: support new CSP for SP2.
						
						
						
						
						
						
						
						conditional check : --match-set vs --set
forgot to merge this in from 2.2.y 
						
						
					 | 
					
						2011-12-29 16:01:40 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								frank
							
						 
					 | 
					
						
						
						
						
							
						
						
							363aea4aee
							
						
					 | 
					
						
						
							
							Bug 12731 - Ebtable rules are blocking all traffic going out of VMs in basic zone
						
						
						
						
						
						
						
						status 12731: resolved fixed
reviewed-by: edison 
						
						
					 | 
					
						2011-12-22 15:04:15 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								anthony
							
						 
					 | 
					
						
						
						
						
							
						
						
							c00d663df2
							
						
					 | 
					
						
						
							
							use soft mount for secondary storage
						
						
						
						
						
						
					 | 
					
						2011-12-21 20:31:40 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								anthony
							
						 
					 | 
					
						
						
						
						
							
						
						
							61eab674d2
							
						
					 | 
					
						
						
							
							bug 12328: XenServer 6.0 changes vnc-port path in xenstore
						
						
						
						
						
						
						
						status 12328: resolved fixed 
						
						
					 | 
					
						2011-12-21 12:00:27 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Edison Su
							
						 
					 | 
					
						
						
						
						
							
						
						
							c067763075
							
						
					 | 
					
						
						
							
							bug 12604: if there are actually snapshots creating on the volume, then don't move the snapshot
						
						
						
						
						
						
						
						status 12604: resolved fixed 
						
						
					 | 
					
						2011-12-20 15:12:31 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chiradeep Vittal
							
						 
					 | 
					
						
						
						
						
							
						
						
							5dfa0ed169
							
						
					 | 
					
						
						
							
							remove obsolete file
						
						
						
						
						
						
					 | 
					
						2011-12-19 10:56:52 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chiradeep Vittal
							
						 
					 | 
					
						
						
						
						
							
						
						
							2278477737
							
						
					 | 
					
						
						
							
							add stronger security to defend against attacks originating in the vm
						
						
						
						
						
						
					 | 
					
						2011-12-19 10:56:52 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chiradeep Vittal
							
						 
					 | 
					
						
						
						
						
							
						
						
							5393a44c56
							
						
					 | 
					
						
						
							
							bug 12290: improve antispoofing lgic
						
						
						
						
						
						
						
						handle reboot within vm correctly
iptables -S missing in csp 
						
						
					 | 
					
						2011-12-19 10:56:52 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								frank
							
						 
					 | 
					
						
						
						
						
							
						
						
							9c4f009c69
							
						
					 | 
					
						
						
							
							Bug 12241 - document all supported options in routing script: cloud-install-sys-tmplt
						
						
						
						
						
						
						
						status 12241: resolved fixed 
						
						
					 | 
					
						2011-12-15 14:49:16 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								anthony
							
						 
					 | 
					
						
						
						
						
							
						
						
							331bd6c103
							
						
					 | 
					
						
						
							
							SWIFT: add error handling code
						
						
						
						
						
						
						
						add swift plugin for XenServer 6.0 
						
						
					 | 
					
						2011-12-14 19:53:56 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Edison Su
							
						 
					 | 
					
						
						
						
						
							
						
						
							ee60039404
							
						
					 | 
					
						
						
							
							bug 8489: remove the leading /
						
						
						
						
						
						
						
						status 8489: resolved fixed 
						
						
					 | 
					
						2011-12-06 14:14:09 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								kishan
							
						 
					 | 
					
						
						
						
						
							
						
						
							489a1d5738
							
						
					 | 
					
						
						
							
							bug 12365: Read secret key from file for encryption type file. For web type use comman-line option -s.
						
						
						
						
						
						
						
						status 12365 : resolved fixed
reviewed-by: Nitin 
						
						
					 | 
					
						2011-12-06 14:52:57 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chiradeep Vittal
							
						 
					 | 
					
						
						
						
						
							
						
						
							797836723d
							
						
					 | 
					
						
						
							
							bug 10804: add default dns provider
						
						
						
						
						
						
					 | 
					
						2011-12-05 16:56:31 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chiradeep Vittal
							
						 
					 | 
					
						
						
						
						
							
						
						
							89f13ad700
							
						
					 | 
					
						
						
							
							bug 10804 virtual router support for per-vm default network
						
						
						
						
						
						
					 | 
					
						2011-12-05 14:53:42 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								kishan
							
						 
					 | 
					
						
						
						
						
							
						
						
							cdbf5b0db5
							
						
					 | 
					
						
						
							
							bug 12262: Updated jasypt jar path
						
						
						
						
						
						
					 | 
					
						2011-12-03 08:47:37 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								kishan
							
						 
					 | 
					
						
						
						
						
							
						
						
							d64747a657
							
						
					 | 
					
						
						
							
							bug 12262: Added "-s" option.  When encryption is used provide mgmt secret key using "-s" option.
						
						
						
						
						
						
						
						status 12262 : resolved fixed
reviewed-by: Prasanna 
						
						
					 | 
					
						2011-12-02 21:12:49 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Naredula Janardhana Reddy
							
						 
					 | 
					
						
						
						
						
							
						
						
							c7766ea6c8
							
						
					 | 
					
						
						
							
							bug 10617: kvm related changes.
						
						
						
						
						
						
					 | 
					
						2011-12-02 17:07:36 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Naredula Janardhana Reddy
							
						 
					 | 
					
						
						
						
						
							
						
						
							0c1e21ab80
							
						
					 | 
					
						
						
							
							bug 10617: vmops related changes.
						
						
						
						
						
						
					 | 
					
						2011-12-01 19:32:57 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Naredula Janardhana Reddy
							
						 
					 | 
					
						
						
						
						
							
						
						
							09905b641b
							
						
					 | 
					
						
						
							
							bug 10617: merge code from branch bug10617.
						
						
						
						
						
						
					 | 
					
						2011-12-01 14:17:52 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								frank
							
						 
					 | 
					
						
						
						
						
							
						
						
							7eddef60fe
							
						
					 | 
					
						
						
							
							Bug 11926 - Need parameter check before execution of cloud-install-sys-tmplt
						
						
						
						
						
						
						
						make the check for mount point a litter earlier
status 11926: resolved fixed 
						
						
					 | 
					
						2011-11-30 13:50:07 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Naredula Janardhana Reddy
							
						 
					 | 
					
						
						
						
						
							
						
						
							f1b99f4f07
							
						
					 | 
					
						
						
							
							Revert "bug 10617: merging code from branch bug10617"
						
						
						
						
						
						
						
						This reverts commit 8bc33448b9220534ba0ddc6c642ffb1e69d5844e.
Conflicts:
	server/src/com/cloud/api/ApiResponseHelper.java 
						
						
					 | 
					
						2011-11-11 20:23:26 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Naredula Janardhana Reddy
							
						 
					 | 
					
						
						
						
						
							
						
						
							02adbd4bd3
							
						
					 | 
					
						
						
							
							bug 10617: merging code from branch bug10617
						
						
						
						
						
						
					 | 
					
						2011-11-10 15:23:48 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								anthony
							
						 
					 | 
					
						
						
						
						
							
						
						
							91aa145f5d
							
						
					 | 
					
						
						
							
							Upgrade: no error for this statement
						
						
						
						
						
						
					 | 
					
						2011-11-04 20:39:39 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								anthony
							
						 
					 | 
					
						
						
						
						
							
						
						
							de4d5f0397
							
						
					 | 
					
						
						
							
							Upgrade : script fix
						
						
						
						
						
						
					 | 
					
						2011-11-04 20:39:26 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								anthony
							
						 
					 | 
					
						
						
						
						
							
						
						
							548839e3bb
							
						
					 | 
					
						
						
							
							bug 11903: create local link when host is connected
						
						
						
						
						
						
						
						status 11903: resolved fixed 
						
						
					 | 
					
						2011-11-04 20:39:05 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								anthony
							
						 
					 | 
					
						
						
						
						
							
						
						
							245cd32281
							
						
					 | 
					
						
						
							
							upgrade : fix script
						
						
						
						
						
						
					 | 
					
						2011-11-04 20:38:42 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								anthony
							
						 
					 | 
					
						
						
						
						
							
						
						
							f30ee3fc91
							
						
					 | 
					
						
						
							
							Upgrade :  eject CD
						
						
						
						
						
						
					 | 
					
						2011-11-04 20:38:15 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Edison Su
							
						 
					 | 
					
						
						
						
						
							
						
						
							6841e265d3
							
						
					 | 
					
						
						
							
							bug 10330: finally merge Rommer's CLVM patch
						
						
						
						
						
						
						
						status 10330: resolved fixed 
						
						
					 | 
					
						2011-11-02 18:03:58 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								anthony
							
						 
					 | 
					
						
						
						
						
							
						
						
							1e86b5e1a6
							
						
					 | 
					
						
						
							
							script fix
						
						
						
						
						
						
					 | 
					
						2011-11-02 17:05:30 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								anthony
							
						 
					 | 
					
						
						
						
						
							
						
						
							f41a9e8b23
							
						
					 | 
					
						
						
							
							propagate local link network
						
						
						
						
						
						
					 | 
					
						2011-11-02 17:05:05 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								anthony
							
						 
					 | 
					
						
						
						
						
							
						
						
							f97b3e5c56
							
						
					 | 
					
						
						
							
							bug 11858: fake pv :  use version in host parameter instead, fix XCP override
						
						
						
						
						
						
						
						status 11858: resolved fixed
commit-by: Kevin Brooks
review-by: Anthony Xu 
						
						
					 | 
					
						2011-11-01 19:51:06 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								anthony
							
						 
					 | 
					
						
						
						
						
							
						
						
							3067a9d2db
							
						
					 | 
					
						
						
							
							Swift : add two new files
						
						
						
						
						
						
					 | 
					
						2011-10-21 14:26:20 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								anthony
							
						 
					 | 
					
						
						
						
						
							
						
						
							c97010a160
							
						
					 | 
					
						
						
							
							BackupSnapshot to Swift
						
						
						
						
						
						
					 | 
					
						2011-10-18 18:11:09 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								anthony
							
						 
					 | 
					
						
						
						
						
							
						
						
							59b084a867
							
						
					 | 
					
						
						
							
							add swift client from 1.4.3 into SSVM
						
						
						
						
						
						
					 | 
					
						2011-10-13 15:52:58 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								anthony
							
						 
					 | 
					
						
						
						
						
							
						
						
							6710f09ab4
							
						
					 | 
					
						
						
							
							swift is written in python 2.6
						
						
						
						
						
						
						
						make swift client work in python 2.4
changes:
1. md5 interface changed
2. urlparse interface changed
3. Queue interface changed 
						
						
					 | 
					
						2011-10-13 12:07:09 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								anthony
							
						 
					 | 
					
						
						
						
						
							
						
						
							01d38fbb3e
							
						
					 | 
					
						
						
							
							add swift client from 1.4.3
						
						
						
						
						
						
					 | 
					
						2011-10-13 11:47:41 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								anthony
							
						 
					 | 
					
						
						
						
						
							
						
						
							7ba15ce49b
							
						
					 | 
					
						
						
							
							remove old swift client
						
						
						
						
						
						
					 | 
					
						2011-10-12 12:11:46 -07:00 | 
					
					
						
						
							
							
							
						
					 |