Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							634cd78baa 
							
						 
					 
					
						
						
							
							Merge branch 'master' into vpc  
						
						... 
						
						
						
						Conflicts:
	api/src/com/cloud/api/ApiConstants.java
	api/src/com/cloud/api/BaseCmd.java
	api/src/com/cloud/api/ResponseGenerator.java
	api/src/com/cloud/api/commands/ListNetworksCmd.java
	api/src/com/cloud/api/response/NetworkResponse.java
	api/src/com/cloud/event/EventTypes.java
	api/src/com/cloud/network/NetworkService.java
	client/tomcatconf/commands.properties.in
	scripts/network/domr/getDomRVersion.sh
	scripts/network/domr/ipassoc.sh
	scripts/network/domr/l2tp_vpn.sh
	scripts/network/domr/networkUsage.sh
	scripts/network/domr/router_proxy.sh
	server/src/com/cloud/api/ApiDBUtils.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/dao/IPAddressDao.java
	server/src/com/cloud/network/dao/IPAddressDaoImpl.java
	setup/apidoc/gen_toc.py
	setup/db/create-schema.sql
	wscript 
						
						
					 
					
						2012-06-28 17:41:40 -07:00 
						 
				 
			
				
					
						
							
							
								David Nalley 
							
						 
					 
					
						
						
						
						
							
						
						
							d630fa8697 
							
						 
					 
					
						
						
							
							license header changes for scripts folder from Chip Childers  
						
						
						
						
					 
					
						2012-06-23 00:58:00 -04:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							a4d0f91cfe 
							
						 
					 
					
						
						
							
							VPC : use routerProxy to call l2tpVpn  
						
						... 
						
						
						
						Conflicts:
	core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java 
						
						
					 
					
						2012-06-15 14:26:20 -07:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							c75fe80125 
							
						 
					 
					
						
						
							
							VPC : use routerProxy to call networkUsage.sh  
						
						... 
						
						
						
						Conflicts:
	core/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java 
						
						
					 
					
						2012-06-15 14:25:21 -07:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							251a91f5b3 
							
						 
					 
					
						
						
							
							VCP : use routerProxy to call checkrouter script  
						
						
						
						
					 
					
						2012-06-15 14:24:18 -07:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							8c1700a3a4 
							
						 
					 
					
						
						
							
							VPC : introduce router_proxy.sh, resource should use this as a proxy to call scripts inside domr  
						
						... 
						
						
						
						already did this for ipassoc and getDomRVersion 
						
						
					 
					
						2012-06-15 14:22:49 -07:00 
						 
				 
			
				
					
						
							
							
								Salvatore Orlando 
							
						 
					 
					
						
						
						
						
							
						
						
							c1539e4e42 
							
						 
					 
					
						
						
							
							CS-14902: Removing files needed for SDN feature from XS 5.6FP1  
						
						
						
						
					 
					
						2012-05-21 15:56:42 +01:00 
						 
				 
			
				
					
						
							
							
								Salvatore Orlando 
							
						 
					 
					
						
						
						
						
							
						
						
							e2cc2c1f6e 
							
						 
					 
					
						
						
							
							Fixing remaining issues with per-VIF flow script and removing version-specific scripts.  
						
						... 
						
						
						
						Now generating XSnetwork names using gre keys
Plus other minor corrections 
						
						
					 
					
						2012-04-23 22:32:52 +01:00 
						 
				 
			
				
					
						
							
							
								Salvatore Orlando 
							
						 
					 
					
						
						
						
						
							
						
						
							9f321ffeac 
							
						 
					 
					
						
						
							
							Open vSwitch tunnel manager  
						
						... 
						
						
						
						Applying patch with new ovs-tunnel-manager on top of cloudstack oss-master 
						
						
					 
					
						2012-04-23 22:32:16 +01: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 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							c97010a160 
							
						 
					 
					
						
						
							
							BackupSnapshot to Swift  
						
						
						
						
					 
					
						2011-10-18 18:11:09 -07:00 
						 
				 
			
				
					
						
							
							
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							89e45bd671 
							
						 
					 
					
						
						
							
							bug 11130: Add GetDomRVersionCmd  
						
						
						
						
					 
					
						2011-09-29 14:50:11 -07:00 
						 
				 
			
				
					
						
							
							
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							3549067d55 
							
						 
					 
					
						
						
							
							bug 11307: Add BumpUpPriorityCommand  
						
						
						
						
					 
					
						2011-09-14 16:22:19 -07:00 
						 
				 
			
				
					
						
							
							
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							9d46de1543 
							
						 
					 
					
						
						
							
							Copy missed getRouterStatus.sh to XenServer FP1 host  
						
						
						
						
					 
					
						2011-08-16 14:21:32 -07:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							b63bee2d9a 
							
						 
					 
					
						
						
							
							bug 10197: add some scripts which is used in upgrade  
						
						
						
						
					 
					
						2011-07-28 15:07:08 -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 
						 
				 
			
				
					
						
							
							
								Frank 
							
						 
					 
					
						
						
						
						
							
						
						
							276e37115b 
							
						 
					 
					
						
						
							
							open vswitch - Implement gre tunnel based network that doesn't use vlan  
						
						... 
						
						
						
						it allows cross zone communication and no 4096 limitation introduced by vlan 
						
						
					 
					
						2011-01-21 17:32:02 -08:00 
						 
				 
			
				
					
						
							
							
								Frank 
							
						 
					 
					
						
						
						
						
							
						
						
							c6683c2eab 
							
						 
					 
					
						
						
							
							bug 7722: open vswitch -  
						
						... 
						
						
						
						refine ovs plugin, create a separate plugin instead of messing with vmops
refine gre tunnel, maintains tunnel in database instead of plugin
fix an arp issue cause by overlap vlan range 
						
						
					 
					
						2011-01-11 02:55:36 -08:00 
						 
				 
			
				
					
						
							
							
								Frank 
							
						 
					 
					
						
						
						
						
							
						
						
							c94b6acadf 
							
						 
					 
					
						
						
							
							bug 7722: open vswitch - works at VM start time, need fullsync() and flow clean in next  
						
						
						
						
					 
					
						2011-01-08 16:22:59 -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 
							
						 
					 
					
						
						
						
						
							
						
						
							bcc327cad1 
							
						 
					 
					
						
						
							
							correct path in patch file  
						
						
						
						
					 
					
						2010-12-21 13:38:40 -08:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							2be0b45297 
							
						 
					 
					
						
						
							
							support xenserver 5.6 fp1 in oss  
						
						
						
						
					 
					
						2010-12-20 14:18:10 -08:00