alena 
							
						 
					 
					
						
						
						
						
							
						
						
							8d47c53735 
							
						 
					 
					
						
						
							
							Revert "bug 10435: removed vpn feature"  
						
						... 
						
						
						
						This reverts commit ea9e1b5d138950e8de49fce7ffdbb12a1c72c560.
Conflicts:
	api/src/com/cloud/api/ResponseGenerator.java
	scripts/vm/hypervisor/xenserver/vmops
	server/src/com/cloud/configuration/Config.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java 
						
						
					 
					
						2011-08-02 18:12:57 -07:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							5b168f30e0 
							
						 
					 
					
						
						
							
							bug 10197: add some scripts which is used in upgrade  
						
						
						
						
					 
					
						2011-07-26 16:22:54 -07:00 
						 
				 
			
				
					
						
							
							
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							44d4113ae6 
							
						 
					 
					
						
						
							
							bug 10429: backport redundant router  
						
						... 
						
						
						
						Part 2
commit 797839360c65cd348d2eb20630521177ab0919de
    bug 9154: redundant virtual router
commit 8ff7f230204d4d3a7a4adee75523a9a84f4276fe
    bug 9154: Replace domain_router.is_master with domain_router.redundant_state in DB
commit 230b99e9e0b152648f1dd2a5eab6f22315b8e7b4
    bug 9154: Add redundant state to DomainRouterResponse
commit ccefb5ff5e83d713798a347c99bce1a0d04b4317
    bug 9154: Add router fault state report
commit 7a3090378f9785caecf741b70554f6ea17c41764
    bug 9154: Send alert if found two virtual routers in master state
commit 66831056e4bf27665871bccd24e6159071564847
    bug 9154: Code clean up
commit bf3f58a85741fa7118bd848a42d8b21baa4478d4
    bug 9154: Add isRedundantRouter to DomainRouterResponse 
						
						
					 
					
						2011-07-18 18:30:02 -07:00 
						 
				 
			
				
					
						
							
							
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							74f34a0e0c 
							
						 
					 
					
						
						
							
							bug 10435: removed vpn feature  
						
						... 
						
						
						
						status 10435: resolved fixed 
						
						
					 
					
						2011-06-24 09:18:46 -07:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							5b1a421e62 
							
						 
					 
					
						
						
							
							bug 8712: prepare from snapshot db migration  
						
						
						
						
					 
					
						2011-03-08 17:10:27 -08:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							0c2a639a2d 
							
						 
					 
					
						
						
							
							bug 6772: use vhd-util to coalesce snapshots into primary storage  
						
						... 
						
						
						
						status 6772: resolved fixed 
						
						
					 
					
						2011-03-07 19:47:29 -08:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							a9c36d7b79 
							
						 
					 
					
						
						
							
							use new vhd-util for xenserver  
						
						
						
						
					 
					
						2011-03-07 19:47:29 -08:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							7ec201bc69 
							
						 
					 
					
						
						
							
							bug 5405: version file is not needed  
						
						... 
						
						
						
						status 5405: resolved fixed 
						
						
					 
					
						2011-01-28 20:06:54 -08:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							9e63416da3 
							
						 
					 
					
						
						
							
							merge setupxenserver  
						
						
						
						
					 
					
						2011-01-28 18:58:50 -08:00 
						 
				 
			
				
					
						
							
							
								Frank 
							
						 
					 
					
						
						
						
						
							
						
						
							ec98a539b4 
							
						 
					 
					
						
						
							
							merge premium xenserver scripts to oss  
						
						
						
						
					 
					
						2011-01-28 17:42:27 -08:00 
						 
				 
			
				
					
						
							
							
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							8a1ca01f44 
							
						 
					 
					
						
						
							
							Bug 8199: insert generated private key where it is expected  
						
						
						
						
					 
					
						2011-01-28 12:24:20 -08:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							b732208c23 
							
						 
					 
					
						
						
							
							change file name  
						
						
						
						
					 
					
						2011-01-04 10:39:05 -08:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							9249ee199f 
							
						 
					 
					
						
						
							
							add setupBonding script  
						
						
						
						
					 
					
						2011-01-03 19:22:07 -08:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							2be0b45297 
							
						 
					 
					
						
						
							
							support xenserver 5.6 fp1 in oss  
						
						
						
						
					 
					
						2010-12-20 14:18:10 -08:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							baa6666897 
							
						 
					 
					
						
						
							
							create xenserver 5.6 patch file  
						
						
						
						
					 
					
						2010-12-17 20:21:28 -08:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							a8a6419bf4 
							
						 
					 
					
						
						
							
							remove scsiutil.py  
						
						
						
						
					 
					
						2010-12-17 16:18:34 -08:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							f1bdebb628 
							
						 
					 
					
						
						
							
							remove LUNperVDI.py  
						
						
						
						
					 
					
						2010-12-17 16:02:11 -08:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							6ff038a9c3 
							
						 
					 
					
						
						
							
							delete ISCSISR.py  
						
						
						
						
					 
					
						2010-12-17 15:53:43 -08:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							c6633f9095 
							
						 
					 
					
						
						
							
							delete cleanup.py  
						
						
						
						
					 
					
						2010-12-17 15:41:47 -08:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							ef9c9b8c5f 
							
						 
					 
					
						
						
							
							split scripts to premium-script  
						
						
						
						
					 
					
						2010-12-03 20:53:53 -08:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							25c0d0f197 
							
						 
					 
					
						
						
							
							patch.tgz and prepsystemvm.sh are not needed, we use iso instead  
						
						
						
						
					 
					
						2010-11-03 17:19:04 -07:00 
						 
				 
			
				
					
						
							
							
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							1e0eb04442 
							
						 
					 
					
						
						
							
							Add VPN apis, some systemvm changes for vpn  
						
						
						
						
					 
					
						2010-11-01 10:27:49 -07:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							7249f168d5 
							
						 
					 
					
						
						
							
							more file changes  
						
						
						
						
					 
					
						2010-09-09 13:27:20 -07:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							5d8cadb7b0 
							
						 
					 
					
						
						
							
							correctly use session in plugin  
						
						
						
						
					 
					
						2010-08-29 23:59:33 -07:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							afd8052203 
							
						 
					 
					
						
						
							
							remove unused scripts  
						
						
						
						
					 
					
						2010-08-29 18:39:15 -07:00 
						 
				 
			
				
					
						
							
							
								Anthony Xu 
							
						 
					 
					
						
						
						
						
							
						
						
							d72e0538da 
							
						 
					 
					
						
						
							
							Revert "Revert "use iso to patch systemvm""  
						
						... 
						
						
						
						This reverts commit 145e2e0aaa9b57286102664787e8e40ad3d75e26. 
						
						
					 
					
						2010-08-26 16:06:28 -07:00 
						 
				 
			
				
					
						
							
							
								Anthony Xu 
							
						 
					 
					
						
						
						
						
							
						
						
							145e2e0aaa 
							
						 
					 
					
						
						
							
							Revert "use iso to patch systemvm"  
						
						... 
						
						
						
						This reverts commit 3565f8d21b331745b99ce3a09a35d642f2f7bcfe. 
						
						
					 
					
						2010-08-26 16:03:34 -07:00 
						 
				 
			
				
					
						
							
							
								root 
							
						 
					 
					
						
						
						
						
							
						
						
							3565f8d21b 
							
						 
					 
					
						
						
							
							use iso to patch systemvm  
						
						... 
						
						
						
						Conflicts:
	core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
	scripts/vm/hypervisor/xenserver/xenserver56/patch 
						
						
					 
					
						2010-08-26 15:56:02 -07:00 
						 
				 
			
				
					
						
							
							
								Anthony Xu 
							
						 
					 
					
						
						
						
						
							
						
						
							09680d80a7 
							
						 
					 
					
						
						
							
							bug 5939: add the new script to patch  
						
						... 
						
						
						
						status 5939: assigned 
						
						
					 
					
						2010-08-18 16:59:04 -07:00 
						 
				 
			
				
					
						
							
							
								Manuel Amador (Rudd-O) 
							
						 
					 
					
						
						
						
						
							
						
						
							05c020e1f6 
							
						 
					 
					
						
						
							
							Source code committed  
						
						
						
						
					 
					
						2010-08-11 09:13:29 -07:00