Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							e62f828e52 
							
						 
					 
					
						
						
							
							bug 11003: Fix HAproxy with new template  
						
						 
						
						... 
						
						
						
						New debian package didn't create directory /var/lib/haproxy, which result in
haproxy fail to work.
status 11003: resolved fixed 
						
						
					 
					
						2011-08-08 17:59:25 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Naredula Janardhana Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							12cadca538 
							
						 
					 
					
						
						
							
							Revert "bug 10561: Allowing ICMP traffic through static NAT"  
						
						 
						
						... 
						
						
						
						This reverts commit 5e74e24bb359456967866cb2c6cc0f6f73570f97. 
						
						
					 
					
						2011-08-08 17:59:05 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							8277584b8a 
							
						 
					 
					
						
						
							
							merge ELB / nectarine branch  
						
						 
						
						
						
						
					 
					
						2011-08-08 15:20:56 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							55eb0e4b65 
							
						 
					 
					
						
						
							
							bug 11003: Fix HAproxy with new template  
						
						 
						
						... 
						
						
						
						New debian package didn't create directory /var/lib/haproxy, which result in
haproxy fail to work.
status 11003: resolved fixed 
						
						
					 
					
						2011-08-08 13:36:53 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							9985df928b 
							
						 
					 
					
						
						
							
							Try to workaround "ip route add" fail in redundant router  
						
						 
						
						... 
						
						
						
						It's probably due to the network is not ready, so wait some time for it. 
						
						
					 
					
						2011-08-05 16:40:57 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							49709d716a 
							
						 
					 
					
						
						
							
							Try to workaround "ip route add" fail in redundant router  
						
						 
						
						... 
						
						
						
						It's probably due to the network is not ready, so wait some time for it. 
						
						
					 
					
						2011-08-05 16:40:35 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							5552b650ff 
							
						 
					 
					
						
						
							
							Merge branch 'guru' into 2.2.8.nectarine  
						
						 
						
						
						
						
					 
					
						2011-08-05 12:27:47 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							ac8b833fb0 
							
						 
					 
					
						
						
							
							Ensure lb vm enables only those services that are necessary. ensure default route  
						
						 
						
						
						
						
					 
					
						2011-08-05 12:16:55 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Abhinandan Prateek 
							
						 
					 
					
						
						
						
						
							
						
						
							dae2f4d958 
							
						 
					 
					
						
						
							
							bug 10748: fixed it when the VM acts as a dhcp server only  
						
						 
						
						... 
						
						
						
						status 10748: resolved fixed 
						
						
					 
					
						2011-08-05 12:07:59 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Abhinandan Prateek 
							
						 
					 
					
						
						
						
						
							
						
						
							0f2a9b6a69 
							
						 
					 
					
						
						
							
							bug 10748: fixed it when the VM acts as a dhcp server only  
						
						 
						
						... 
						
						
						
						status 10748: resolved fixed 
						
						
					 
					
						2011-08-05 12:02:54 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Abhinandan Prateek 
							
						 
					 
					
						
						
						
						
							
						
						
							c460a1b80b 
							
						 
					 
					
						
						
							
							bug 10748: fixed it when the VM acts as a dhcp server only  
						
						 
						
						... 
						
						
						
						status 10748: resolved fixed 
						
						
					 
					
						2011-08-05 11:58:48 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							0c408d8da5 
							
						 
					 
					
						
						
							
							handle elb vm restart  
						
						 
						
						
						
						
					 
					
						2011-08-04 22:05:48 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							61fd6a79c8 
							
						 
					 
					
						
						
							
							ensure elb vm is managed by elb manager  
						
						 
						
						
						
						
					 
					
						2011-08-04 17:02:27 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							e936a52f10 
							
						 
					 
					
						
						
							
							merge changes from parent branch  
						
						 
						
						
						
						
					 
					
						2011-08-04 12:39:25 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Naredula Janardhana Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							46427fef91 
							
						 
					 
					
						
						
							
							bug 10561: Allowing ICMP traffic through static NAT  
						
						 
						
						
						
						
					 
					
						2011-08-03 21:15:02 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Naredula Janardhana Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							954d8673c7 
							
						 
					 
					
						
						
							
							bug 10561: Allowing ICMP traffic through static NAT  
						
						 
						
						
						
						
					 
					
						2011-08-03 18:13:09 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Abhinandan Prateek 
							
						 
					 
					
						
						
						
						
							
						
						
							f6303c13fb 
							
						 
					 
					
						
						
							
							bug 10812: putting key in ZoneConfig and other nomenclature changes  
						
						 
						
						
						
						
					 
					
						2011-08-03 14:42:29 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Abhinandan Prateek 
							
						 
					 
					
						
						
						
						
							
						
						
							cd78c5cb9b 
							
						 
					 
					
						
						
							
							bug 10812: putting key in ZoneConfig and other nomenclature changes  
						
						 
						
						
						
						
					 
					
						2011-08-03 14:32:28 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Abhinandan Prateek 
							
						 
					 
					
						
						
						
						
							
						
						
							6dd519ddd4 
							
						 
					 
					
						
						
							
							bug 10812: putting key in ZoneConfig and other nomenclature changes  
						
						 
						
						
						
						
					 
					
						2011-08-03 14:16:08 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Abhinandan Prateek 
							
						 
					 
					
						
						
						
						
							
						
						
							7e727be42c 
							
						 
					 
					
						
						
							
							bug 10748: use external dnses if set thru global config (dhcp otpion 6)  
						
						 
						
						
						
						
					 
					
						2011-08-03 12:34:02 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Abhinandan Prateek 
							
						 
					 
					
						
						
						
						
							
						
						
							2f804dd799 
							
						 
					 
					
						
						
							
							bug 10748: use external dns, configurable thru global param  
						
						 
						
						
						
						
					 
					
						2011-08-02 16:21:55 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Abhinandan Prateek 
							
						 
					 
					
						
						
						
						
							
						
						
							9009026eba 
							
						 
					 
					
						
						
							
							bug 10748: use external dns  
						
						 
						
						... 
						
						
						
						status 10748: resolved fixed 
						
						
					 
					
						2011-08-02 15:35:13 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Abhinandan Prateek 
							
						 
					 
					
						
						
						
						
							
						
						
							4f3dec5f1c 
							
						 
					 
					
						
						
							
							bug 10812:  adding domain suffixes to zone's router conf  
						
						 
						
						
						
						
					 
					
						2011-08-02 11:34:38 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Abhinandan Prateek 
							
						 
					 
					
						
						
						
						
							
						
						
							5cb3882349 
							
						 
					 
					
						
						
							
							bug 10812: adding domain suffixes to zone's router conf  
						
						 
						
						
						
						
					 
					
						2011-08-02 11:23:33 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Abhinandan Prateek 
							
						 
					 
					
						
						
						
						
							
						
						
							46be774ce8 
							
						 
					 
					
						
						
							
							bug 10812: adding domain suffixes to zone's router conf  
						
						 
						
						
						
						
					 
					
						2011-08-02 11:08:24 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							56d7be35f1 
							
						 
					 
					
						
						
							
							WIP  
						
						 
						
						
						
						
					 
					
						2011-07-29 11:04:54 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Naredula Janardhana Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							15d57cef9f 
							
						 
					 
					
						
						
							
							bug 10557: implemented the TODO - opening the stats port using iptable  
						
						 
						
						
						
						
					 
					
						2011-07-28 17:28:20 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Naredula Janardhana Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							d79633b545 
							
						 
					 
					
						
						
							
							bug 10800: iptable rable restore upon failure is changed  
						
						 
						
						
						
						
					 
					
						2011-07-28 17:27:44 +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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Naredula Janardhana Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							e19c51e68c 
							
						 
					 
					
						
						
							
							bug 10800: iptable rable restore upon failure is changed  
						
						 
						
						
						
						
					 
					
						2011-07-28 13:43:07 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							f27116c50e 
							
						 
					 
					
						
						
							
							log haproxy changes to system log and auth  
						
						 
						
						
						
						
					 
					
						2011-07-27 12:00:08 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							07c2f6cdc7 
							
						 
					 
					
						
						
							
							differentiate between dhcp server and elb vm  
						
						 
						
						
						
						
					 
					
						2011-07-27 12:00:07 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Naredula Janardhana Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							296d0af503 
							
						 
					 
					
						
						
							
							bug 10800: Load balancer - deleted settings from UI not removed from the Iptables  
						
						 
						
						
						
						
					 
					
						2011-07-27 14:57:49 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							9761661989 
							
						 
					 
					
						
						
							
							bug 10855: fix a typo when merging git conflicts  
						
						 
						
						
						
						
					 
					
						2011-07-26 10:50:33 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							db29f7792c 
							
						 
					 
					
						
						
							
							bug 10855: the issue is caused by expanding content that has space inside at sub-shell, use back quote substitution to enforce the correct shell macro expansion  
						
						 
						
						
						
						
					 
					
						2011-07-26 10:50:10 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							3e8fb4add2 
							
						 
					 
					
						
						
							
							bug 10855: fix a typo when merging git conflicts  
						
						 
						
						
						
						
					 
					
						2011-07-26 10:48:54 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							db09c6ae47 
							
						 
					 
					
						
						
							
							bug 10855: the issue is caused by expanding content that has space inside at sub-shell, use back quote substitution to enforce the correct shell macro expansion  
						
						 
						
						
						
						
					 
					
						2011-07-26 10:41:26 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Naredula Janardhana Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							67dc2ec915 
							
						 
					 
					
						
						
							
							bug 10800: Load balancer - deleted settings from UI not removed from the Iptables  
						
						 
						
						
						
						
					 
					
						2011-07-26 15:28:01 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							30942b77a3 
							
						 
					 
					
						
						
							
							fix meta data returning 404 issue on vmware  
						
						 
						
						
						
						
					 
					
						2011-07-25 21:20:09 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							3a17b37808 
							
						 
					 
					
						
						
							
							fix meta data returning 404 issue on vmware  
						
						 
						
						
						
						
					 
					
						2011-07-25 21:17:42 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Abhinandan Prateek 
							
						 
					 
					
						
						
						
						
							
						
						
							dff712f2a9 
							
						 
					 
					
						
						
							
							bug 10731: sending source cidrs to the required router element, on domR allowing these source cidrs thru iptables  
						
						 
						
						... 
						
						
						
						status 10731: resolved fixed 
						
						
					 
					
						2011-07-21 13:48:42 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Abhinandan Prateek 
							
						 
					 
					
						
						
						
						
							
						
						
							de34d6089d 
							
						 
					 
					
						
						
							
							bug 10731: sending source cidrs to the required router element, on domR allowing these source cidrs thru iptables  
						
						 
						
						... 
						
						
						
						status 10731: resolved fixed 
						
						
					 
					
						2011-07-21 13:40:06 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							04cdca07fa 
							
						 
					 
					
						
						
							
							Enforce redundant router command line checking in patchsystemvm.sh  
						
						 
						
						
						
						
					 
					
						2011-07-19 15:41:14 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							ed611fa200 
							
						 
					 
					
						
						
							
							Enforce redundant router command line checking in patchsystemvm.sh  
						
						 
						
						
						
						
					 
					
						2011-07-19 15:40:53 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							4bc8686513 
							
						 
					 
					
						
						
							
							bug 10429: Backport redundant virtual router  
						
						 
						
						... 
						
						
						
						Part 1
This backport contained:
commit 52317c718c25111c2535657139b541db0c9d1e1f
    bug 9154: Initial check in for enabling redundant virtual router
commit 54199112055d754371bfb141168fb5538bf6d6ea
    Add host verification for CheckRouterCommand
commit cef978a228c90056ead9be10cbc4de74c2b8de76
    Fix CheckRouterAnswer's isMaster report
commit 4072f0a6991ac3b63601a1764fbe14188965f62f
    Some build fixes and code refactoring for redundant router
commit 4d3350b7cd8ee2706a9bace4437fc194e36c8dd5
    Redundant Router: Fix OVS
commit 6a228830e7c46d819fa0c3317e159e041337e887
    Fix findByNetwork()/findByNetworkAndPod()'s return
commit c627777b3d5bdbcd60db4032cebd349a5b1ecd83
    Redundant Router: Fix isVmAlive()
commit e1275d2514adc41f8744f5107d4069c38be195f1
    Only issue CheckRouterCommand to redundant routers
And all modification to the scripts till
commit 4e3942462ed3fde3a3d7011e95839e2128fba514
logging changes
in the master branch. 
						
						
					 
					
						2011-07-18 18:29:56 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							a622b48d32 
							
						 
					 
					
						
						
							
							It breaks port forwording.  
						
						 
						
						... 
						
						
						
						Revert "bug 10329: changed - t :"
This reverts commit 16779afa0233e6ff33cdfca12611e6a43bcd0b42. 
						
						
					 
					
						2011-07-08 13:52:49 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							399c1addb9 
							
						 
					 
					
						
						
							
							fix meta issue for vmware: create a blank meta data file, even meta data is empty  
						
						 
						
						
						
						
					 
					
						2011-07-08 13:51:30 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							a3613f2762 
							
						 
					 
					
						
						
							
							It breaks port forwording.  
						
						 
						
						... 
						
						
						
						Revert "bug 10329: changed - t :"
This reverts commit 16779afa0233e6ff33cdfca12611e6a43bcd0b42. 
						
						
					 
					
						2011-07-07 18:30:42 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Abhinandan Prateek 
							
						 
					 
					
						
						
						
						
							
						
						
							73b79deb99 
							
						 
					 
					
						
						
							
							bug 10329: changed - t :  
						
						 
						
						... 
						
						
						
						status 10329: resolved fixed 
						
						
					 
					
						2011-07-07 11:52:04 +05:30