Gavin Lee
							
						 
					 | 
					
						
						
						
						
							
						
						
							d3921139ed
							
						
					 | 
					
						
						
							
							Patch from Gavin Lee: Change license to ASL2.0 in server and tools
						
						
						
						
						
						
						
						Signed-off-by: Chip Childers <chip.childers@gmail.com> 
						
						
					 | 
					
						2012-08-30 10:36:29 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alena Prokharchyk
							
						 
					 | 
					
						
						
						
						
							
						
						
							5a72044dc7
							
						
					 | 
					
						
						
							
							Merge branch 'master' into vpc
						
						
						
						
						
						
					 | 
					
						2012-08-03 14:30:54 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chip Childers
							
						 
					 | 
					
						
						
						
						
							
						
						
							09bdd3b6c3
							
						
					 | 
					
						
						
							
							License header updates for the scripts folder.
						
						
						
						
						
						
					 | 
					
						2012-08-03 09:38:28 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sheng Yang
							
						 
					 | 
					
						
						
						
						
							
						
						
							8d4079d477
							
						
					 | 
					
						
						
							
							CS-6840: Add hypervisor commands for site-to-site vpn
						
						
						
						
						
						
						
						Conflicts:
	plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java 
						
						
					 | 
					
						2012-07-02 16:28:44 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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
							
						 
					 | 
					
						
						
						
						
							
						
						
							a08c9e7890
							
						
					 | 
					
						
						
							
							VPC : move acl.sh ipassoc.sh to /opt/cloud/bin/
						
						
						
						
						
						
					 | 
					
						2012-06-15 14:24:09 -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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								frank
							
						 
					 | 
					
						
						
						
						
							
						
						
							2f634c0913
							
						
					 | 
					
						
						
							
							Switch to Apache license
						
						
						
						
						
						
					 | 
					
						2012-04-03 04:50:05 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								frank
							
						 
					 | 
					
						
						
						
						
							
						
						
							52610ffcb3
							
						
					 | 
					
						
						
							
							add copyright header to shell scripts
						
						
						
						
						
						
					 | 
					
						2012-01-11 18:41:53 -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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sheng Yang
							
						 
					 | 
					
						
						
						
						
							
						
						
							89e45bd671
							
						
					 | 
					
						
						
							
							bug 11130: Add GetDomRVersionCmd
						
						
						
						
						
						
					 | 
					
						2011-09-29 14:50:11 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								kishan
							
						 
					 | 
					
						
						
						
						
							
						
						
							8ffeddb020
							
						
					 | 
					
						
						
							
							bug 11547: Reset iptables counter when a public interface on domR is removed
						
						
						
						
						
						
					 | 
					
						2011-09-23 15:43:45 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sheng Yang
							
						 
					 | 
					
						
						
						
						
							
						
						
							9317033a4f
							
						
					 | 
					
						
						
							
							Add missing files for redundant router.
						
						
						
						
						
						
					 | 
					
						2011-09-14 16:25:56 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sheng Yang
							
						 
					 | 
					
						
						
						
						
							
						
						
							b987123daa
							
						
					 | 
					
						
						
							
							bug 11307: Let CheckRouterAnswer() parse the return result
						
						
						
						
						
						
					 | 
					
						2011-09-14 16:21:33 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								frank
							
						 
					 | 
					
						
						
						
						
							
						
						
							b3478c377e
							
						
					 | 
					
						
						
							
							Full opensource
						
						
						
						
						
						
					 | 
					
						2011-08-23 19:52:19 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Naredula Janardhana Reddy
							
						 
					 | 
					
						
						
						
						
							
						
						
							b9183c0840
							
						
					 | 
					
						
						
							
							bug 10561: merging code from 2.2.10 to master
						
						
						
						
						
						
					 | 
					
						2011-08-16 14:20:51 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Naredula Janardhana Reddy
							
						 
					 | 
					
						
						
						
						
							
						
						
							2fc7be14de
							
						
					 | 
					
						
						
							
							bug 10557: implemented the TODO - opening the stats port using iptable
						
						
						
						
						
						
					 | 
					
						2011-07-28 17:24:10 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								frank
							
						 
					 | 
					
						
						
						
						
							
						
						
							3c1a375978
							
						
					 | 
					
						
						
							
							Bug 9887 - baremetal: support for image operation (create template from guest disk)
						
						
						
						
						
						
						
						Resolved fixed 
						
						
					 | 
					
						2011-07-07 15:34:42 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sheng Yang
							
						 
					 | 
					
						
						
						
						
							
						
						
							5db86e6c20
							
						
					 | 
					
						
						
							
							Fix CheckRouterAnswer's isMaster report
						
						
						
						
						
						
						
						If we got invalid/unsuccessed answer from CheckRouterAnswer, set master to
false.
Also add missed scripts. 
						
						
					 | 
					
						2011-06-07 14:47:46 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chiradeep Vittal
							
						 
					 | 
					
						
						
						
						
							
						
						
							88b453928c
							
						
					 | 
					
						
						
							
							bug 9771: fix metadata url
						
						
						
						
						
						
					 | 
					
						2011-05-12 15:06:54 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Frank
							
						 
					 | 
					
						
						
						
						
							
						
						
							fd24a1e240
							
						
					 | 
					
						
						
							
							Use static IP when PING provisioning
						
						
						
						
						
						
					 | 
					
						2011-05-06 19:44:01 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Edison Su
							
						 
					 | 
					
						
						
						
						
							
						
						
							1139868af9
							
						
					 | 
					
						
						
							
							fix vm data permission issue, by ssh to domr, chmod to 644
						
						
						
						
						
						
					 | 
					
						2011-05-02 11:01:19 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Edison Su
							
						 
					 | 
					
						
						
						
						
							
						
						
							7e8d02defb
							
						
					 | 
					
						
						
							
							bug 8955: add umask 022 to make sure we can get read permission for user data
						
						
						
						
						
						
						
						status 8955: resolved fixed 
						
						
					 | 
					
						2011-04-27 10:28:23 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Frank
							
						 
					 | 
					
						
						
						
						
							
						
						
							92155522f2
							
						
					 | 
					
						
						
							
							Add license header to files
						
						
						
						
						
						
					 | 
					
						2011-04-14 11:23:14 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Frank
							
						 
					 | 
					
						
						
						
						
							
						
						
							3968a3014b
							
						
					 | 
					
						
						
							
							Bug 8208 - bare metal provisioning
						
						
						
						
						
						
						
						mv prepare_ping.sh to prepare_dhcpd.sh 
						
						
					 | 
					
						2011-04-13 16:42:55 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Frank
							
						 
					 | 
					
						
						
						
						
							
						
						
							148a46f629
							
						
					 | 
					
						
						
							
							Bug 8208 - bare metal provisioning
						
						
						
						
						
						
						
						remove PING binary from source 
						
						
					 | 
					
						2011-04-12 16:38:34 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Frank
							
						 
					 | 
					
						
						
						
						
							
						
						
							65dda266f5
							
						
					 | 
					
						
						
							
							Bug 8208 - bare metal provisioning
						
						
						
						
						
						
						
						user lower case for tftp boot file 
						
						
					 | 
					
						2011-04-11 14:58:09 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Frank
							
						 
					 | 
					
						
						
						
						
							
						
						
							5819e8fee0
							
						
					 | 
					
						
						
							
							Bug 8208 - bare metal provisioning
						
						
						
						
						
						
						
						Work with PING 
						
						
					 | 
					
						2011-04-04 19:19:42 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Frank
							
						 
					 | 
					
						
						
						
						
							
						
						
							ab643851c5
							
						
					 | 
					
						
						
							
							Bug 8208 - bare metal provisioning
						
						
						
						
						
						
						
						support dhcpd as external dhcp server 
						
						
					 | 
					
						2011-04-02 19:42:27 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Frank
							
						 
					 | 
					
						
						
						
						
							
						
						
							a414d33e12
							
						
					 | 
					
						
						
							
							Bug 8208 - bare metal provisioning
						
						
						
						
						
						
						
						setup name server when prepare external dhcp server 
						
						
					 | 
					
						2011-03-21 17:06:17 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Frank
							
						 
					 | 
					
						
						
						
						
							
						
						
							02cd820645
							
						
					 | 
					
						
						
							
							Bug 8208 - bare metal provisioning
						
						
						
						
						
						
						
						Ingore bootp and pxe boot request in external DHCP server 
						
						
					 | 
					
						2011-03-16 17:00:55 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Frank
							
						 
					 | 
					
						
						
						
						
							
						
						
							1a307faefd
							
						
					 | 
					
						
						
							
							Bug 8208 - bare metal provisioning
						
						
						
						
						
						
						
						fix wrong result comparsion in prepare_dnsmasq.sh 
						
						
					 | 
					
						2011-03-16 10:15:55 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Frank
							
						 
					 | 
					
						
						
						
						
							
						
						
							e872996084
							
						
					 | 
					
						
						
							
							Bug 8208 - bare metal provisioning
						
						
						
						
						
						
						
						get DHCP entry state from DHCP server 
						
						
					 | 
					
						2011-03-11 14:09:23 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Frank
							
						 
					 | 
					
						
						
						
						
							
						
						
							4324efea26
							
						
					 | 
					
						
						
							
							Bug 8208 - bare metal provisioning
						
						
						
						
						
						
						
						able to get IP from external DHCP server 
						
						
					 | 
					
						2011-03-11 14:09:23 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Frank
							
						 
					 | 
					
						
						
						
						
							
						
						
							469280866d
							
						
					 | 
					
						
						
							
							Bug 8208 - bare metal provisioning
						
						
						
						
						
						
						
						able to add external DHCP server 
						
						
					 | 
					
						2011-03-08 17:29:33 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chiradeep Vittal
							
						 
					 | 
					
						
						
						
						
							
						
						
							10dc1c75d8
							
						
					 | 
					
						
						
							
							bug 8370: pass in original params when calling delete during add
						
						
						
						
						
						
						
						status 8370: resolved fixed 
						
						
					 | 
					
						2011-02-08 16:41:27 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chiradeep Vittal
							
						 
					 | 
					
						
						
						
						
							
						
						
							711c4eeaae
							
						
					 | 
					
						
						
							
							bug 8209,8370,8459: cleanup scripting
						
						
						
						
						
						
					 | 
					
						2011-02-08 12:10:07 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chiradeep Vittal
							
						 
					 | 
					
						
						
						
						
							
						
						
							757bd0b5e4
							
						
					 | 
					
						
						
							
							bug 8254: point save password to right location
						
						
						
						
						
						
					 | 
					
						2011-01-28 16:01:52 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chiradeep Vittal
							
						 
					 | 
					
						
						
						
						
							
						
						
							8ba1b2d33a
							
						
					 | 
					
						
						
							
							bug 7380: SNAT rules when there are multiple public interfaces
						
						
						
						
						
						
					 | 
					
						2011-01-13 15:49:23 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								abhishek
							
						 
					 | 
					
						
						
						
						
							
						
						
							239942bbe1
							
						
					 | 
					
						
						
							
							refactored all the commands to cater to keshav's needs, and added the new apis. the initial set of testing is complete, will now focus on corner cases
						
						
						
						
						
						
					 | 
					
						2010-11-11 13:07:26 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								abhishek
							
						 
					 | 
					
						
						
						
						
							
						
						
							e5ca5dddf9
							
						
					 | 
					
						
						
							
							renaming the ip forwarding commands to port forwarding commands, and beginning to work on Keshav's request to modify the current 1-1 NAT to be compatible with the Amazon apis
						
						
						
						
						
						
					 | 
					
						2010-11-11 13:07:26 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chiradeep Vittal
							
						 
					 | 
					
						
						
						
						
							
						
						
							04f89d89ec
							
						
					 | 
					
						
						
							
							bug 6981: merge from 2.1.x bug 6807
						
						
						
						
						
						
						
						status 6981: resolved fixed 
						
						
					 | 
					
						2010-11-04 12:45:46 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chiradeep Vittal
							
						 
					 | 
					
						
						
						
						
							
						
						
							900d597002
							
						
					 | 
					
						
						
							
							bug 6981: merge from 2.1.x
						
						
						
						
						
						
					 | 
					
						2010-11-04 12:30:55 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chiradeep Vittal
							
						 
					 | 
					
						
						
						
						
							
						
						
							542a6da0d7
							
						
					 | 
					
						
						
							
							bug 6981: restore ipassoc behaviour
						
						
						
						
						
						
					 | 
					
						2010-11-04 11:53:42 -07:00 | 
					
					
						
						
							
							
							
						
					 |