Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							c67594ef50 
							
						 
					 
					
						
						
							
							bug 11300: Make restartNetwork destroy and recreate DHCP server  
						
						 
						
						... 
						
						
						
						status 11300: resolved fixed 
						
						
					 
					
						2011-09-15 11:56:31 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							2138f86bb3 
							
						 
					 
					
						
						
							
							bug 11447: don't do security group check if both groups belong to the same domain  
						
						 
						
						... 
						
						
						
						status 11447: resolved fixed 
						
						
					 
					
						2011-09-15 10:08:00 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nitin 
							
						 
					 
					
						
						
						
						
							
						
						
							d53c3f0798 
							
						 
					 
					
						
						
							
							bug 11051: Listing Secondary Storage - also show the total and used storage. Listing Storage pools show the realtime storage stats and correctly populate the allocated storage.  
						
						 
						
						
						
						
					 
					
						2011-09-15 15:53:31 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Naredula Janardhana Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							10fb507609 
							
						 
					 
					
						
						
							
							bug 11372:  
						
						 
						
						... 
						
						
						
						Added two New values "all" and "default" to global config "network.loadbalancer.haproxy.stats.visibility" . With this change, it can take six possible value:
            global - stats visible from public network.
            guest-network - stats visible only to guestnetwork.
            link-local - stats visible only to link local network(for xen and kvm).
            disabled - stats disabled.
            all - stats available on public,guest and link-local. (Newly added)
            default - stats availble on the serving http port, this does need any specific http port.(Newly added)
   Except "default" and "disabled", all the rest of 4 need to configure the stats port. 
						
						
					 
					
						2011-09-15 11:46:34 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Murali Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							bb7b6d5eee 
							
						 
					 
					
						
						
							
							fixing build break due to commit edbd3a862ce16cce1b22f54c843d33f8f6cf809c  
						
						 
						
						
						
						
					 
					
						2011-09-15 11:40:46 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							6ecc981e25 
							
						 
					 
					
						
						
							
							bug 9777: introduce Error status for snapshot, if snapshot creation fails, it will be in Error status  
						
						 
						
						... 
						
						
						
						status 9777: resolved fixed 
						
						
					 
					
						2011-09-14 18:14:02 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							1b9552ea74 
							
						 
					 
					
						
						
							
							Let VmwareInvestigator return fake but meaningful investigation result  
						
						 
						
						
						
						
					 
					
						2011-09-14 17:04:28 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							c85902b04c 
							
						 
					 
					
						
						
							
							bug 11307: Using latest query result rather than set bumpup to false  
						
						 
						
						... 
						
						
						
						After the host is disconnected, we can't get latest result, but it's not safe to
think it's priority bump up flag changed. 
						
						
					 
					
						2011-09-14 16:26:48 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							f19fca6ec6 
							
						 
					 
					
						
						
							
							Fix restartNetwork wrongly report stop failure  
						
						 
						
						
						
						
					 
					
						2011-09-14 16:24:43 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							474d1a6034 
							
						 
					 
					
						
						
							
							bug 11307: Add destroyRouter command  
						
						 
						
						
						
						
					 
					
						2011-09-14 16:23:42 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							684a603a6e 
							
						 
					 
					
						
						
							
							bug 11307: Add cleanup parameter to restartNetwork command  
						
						 
						
						... 
						
						
						
						Default set it to true. When cleanup=false, restartNetwork would only
re-implement the network, but don't destroy current existed routers. 
						
						
					 
					
						2011-09-14 16:23:34 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							e330e97f4b 
							
						 
					 
					
						
						
							
							bug 11307: Mark router as to-be-stopped, rather than force stop it.  
						
						 
						
						... 
						
						
						
						Force stop the router would release all the resources it used, but router may
still running. Add a column "stop_pending" in the database, and stop it when the
router come back.
Admin would able to choose to force destroy such router, then recover the
network using restartNetwork command with cleanup=false. 
						
						
					 
					
						2011-09-14 16:23:17 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							ebd67feae7 
							
						 
					 
					
						
						
							
							bug 11307: Rewrite the redundant router's priority  
						
						 
						
						... 
						
						
						
						Now the very first router's priority would be 100, and the second one would be
100 - 2 + 1 = 99. 
						
						
					 
					
						2011-09-14 16:22:33 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							dfd36e4ae2 
							
						 
					 
					
						
						
							
							bug 11307: Add Bumped field for domain_router  
						
						 
						
						... 
						
						
						
						Only used for redundant virtual router. 
						
						
					 
					
						2011-09-14 16:22:11 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							b987123daa 
							
						 
					 
					
						
						
							
							bug 11307: Let CheckRouterAnswer() parse the return result  
						
						 
						
						
						
						
					 
					
						2011-09-14 16:21:33 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							bb9fda3435 
							
						 
					 
					
						
						
							
							Fixed the problem in addDhcpEntry code when _dnsBasicZoneUpdates was never reset once set to false.  
						
						 
						
						... 
						
						
						
						Conflicts:
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java 
						
						
					 
					
						2011-09-14 16:11:01 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							7a64d8fda4 
							
						 
					 
					
						
						
							
							add VmwareInvestigator and VmwareFencer, use short worker VM name to avoid vCenter truncation  
						
						 
						
						
						
						
					 
					
						2011-09-14 15:15:26 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							313b624373 
							
						 
					 
					
						
						
							
							bug 9777: only allow to delete snapshot in BackedUp status  
						
						 
						
						... 
						
						
						
						status 9777: resolved fixed 
						
						
					 
					
						2011-09-14 14:16:19 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							5f9246114b 
							
						 
					 
					
						
						
							
							bug 10435: use "hostName" instead of "name" as a search filed in listSystemVms  
						
						 
						
						... 
						
						
						
						status 10435: resolved fixed 
						
						
					 
					
						2011-09-14 11:01:37 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							b7f45cfbd6 
							
						 
					 
					
						
						
							
							bug 11434: don't execute destroy call when vm is already in Destroyed/Expunging state  
						
						 
						
						... 
						
						
						
						status 11434: resolved fixed 
						
						
					 
					
						2011-09-14 10:33:45 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								prachi 
							
						 
					 
					
						
						
						
						
							
						
						
							ea97ce2a93 
							
						 
					 
					
						
						
							
							Bug 11430 - add host > Host Tags field missing from DB + UI even when host tags specified in add host 2.2.y -> 2.2.12 KVM  
						
						 
						
						... 
						
						
						
						Changes:
A KVM agent always connects to the management server itself, we dont have to do direct connect. This part of code was missing updating the DB host entry with hosttags.
Corrected the code to save the hosttags while adding a KVM host. 
						
						
					 
					
						2011-09-14 10:27:07 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Murali Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							78a5b651ac 
							
						 
					 
					
						
						
							
							bug 11425: dont count direct IP in resource count while updating resource count through API  
						
						 
						
						... 
						
						
						
						status 11425: resolved fixed 
						
						
					 
					
						2011-09-14 22:52:30 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nitin 
							
						 
					 
					
						
						
						
						
							
						
						
							20f0707755 
							
						 
					 
					
						
						
							
							bug 11190: My changes got reverted. Putting them back - Treating the max account limits with -1 values as infinite  
						
						 
						
						
						
						
					 
					
						2011-09-14 19:35:48 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							d6cbd2b6bc 
							
						 
					 
					
						
						
							
							bug 11275:  
						
						 
						
						... 
						
						
						
						remove heartbeat entry for this Primary Storage, when put this Primary Storage into maintenance mode
create heartbeat entry for this Primary Storage, when cancal maintenance for this Primary Storage
status 11275: resolved fixed 
						
						
					 
					
						2011-09-13 22:15:21 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							71385f7cc0 
							
						 
					 
					
						
						
							
							check hypervisorType and StoragePoolType in OCFS2 manager when delete host  
						
						 
						
						... 
						
						
						
						don't take lock in processResourceEvent() 
						
						
					 
					
						2011-09-13 17:35:58 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							45c595d558 
							
						 
					 
					
						
						
							
							Don't update resource count for system account  
						
						 
						
						
						
						
					 
					
						2011-09-13 16:58:54 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							569427ba1f 
							
						 
					 
					
						
						
							
							bug 11036: if resource_count record is missing for account or domain, insert it during the management server startup (with count=0)  
						
						 
						
						... 
						
						
						
						status 11036: resolved fixed 
						
						
					 
					
						2011-09-13 15:23:27 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							f071ce571c 
							
						 
					 
					
						
						
							
							bug 10949: if a cluster doesn't have any hosts, set cluster guid to new one when add host to this cluster.  
						
						 
						
						... 
						
						
						
						status 10949: resolved fixed 
						
						
					 
					
						2011-09-13 13:53:23 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							b05c69f3b3 
							
						 
					 
					
						
						
							
							bug 11246: return lb rule Id in the async response for createLoadBalancer api  
						
						 
						
						... 
						
						
						
						status 11246: resolved fixed 
						
						
					 
					
						2011-09-13 12:08:12 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							c5bc16ef42 
							
						 
					 
					
						
						
							
							XcpServerDiscoverer is only for XenServer  
						
						 
						
						
						
						
					 
					
						2011-09-13 11:11:55 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kishan 
							
						 
					 
					
						
						
						
						
							
						
						
							d2293137c7 
							
						 
					 
					
						
						
							
							bug 11199: Moved DB upgrade changes to schema-2211to2212-premium  
						
						 
						
						... 
						
						
						
						status 11199: resolved fixed 
						
						
					 
					
						2011-09-13 23:28:54 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							f6a79c603f 
							
						 
					 
					
						
						
							
							bug 11036: resource count update is refactored  
						
						 
						
						... 
						
						
						
						status 11036: resolved fixed
1) Use row locks instead of global lock when update resource_count table. When update resource_count for account, make sure that we lock account+all related domains
2) Insert resource_count records for account/domain at the moment when account/domain is created.
3) As a part of DB upgrade, insert missing resource_count records for all non-removed accounts/domains
Conflicts:
	core/src/com/cloud/alert/AlertManager.java
	server/test/com/cloud/agent/MockAgentManagerImpl.java 
						
						
					 
					
						2011-09-13 10:47:36 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							9b424a762d 
							
						 
					 
					
						
						
							
							fix compilation of mocks  
						
						 
						
						
						
						
					 
					
						2011-09-13 09:22:52 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							ae64c56c12 
							
						 
					 
					
						
						
							
							bug 11413: when mark host ad disconnected, set lastping to now - pingtimeout  
						
						 
						
						... 
						
						
						
						status 11413: resolved fixed 
						
						
					 
					
						2011-09-12 18:50:07 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							3cb4ad4934 
							
						 
					 
					
						
						
							
							Add more detail when unable to schedule cleanup  
						
						 
						
						... 
						
						
						
						clean up tests for security group manager v2
move interval to listener -- allows it to be configurable if needed
fix mocks
Enhanced logging for security group manager (from zucchini)
fix merge issues
merge issues 
						
						
					 
					
						2011-09-12 18:22:55 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							1f3c6efb81 
							
						 
					 
					
						
						
							
							Retry only a few times  
						
						 
						
						
						
						
					 
					
						2011-09-12 18:20:24 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							fae5e84699 
							
						 
					 
					
						
						
							
							if the xenserver host cannot do bridge firewalling do not attempt to retry the security rule updat  
						
						 
						
						... 
						
						
						
						change some logs to debug level 
						
						
					 
					
						2011-09-12 18:20:24 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							65fb83035f 
							
						 
					 
					
						
						
							
							Enable monitoring over JMX  
						
						 
						
						... 
						
						
						
						Add the ability to disable some vms from being scheduled
Add ability to trigger ruleset updates from JMX
added a few more dangerous JMX operations 
						
						
					 
					
						2011-09-12 18:20:24 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							d81bc5a375 
							
						 
					 
					
						
						
							
							Dequeue the vm with the largest id first -- this ensures that newly started vms get updated early  
						
						 
						
						
						
						
					 
					
						2011-09-12 18:20:23 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							925f5f2f09 
							
						 
					 
					
						
						
							
							Retry 3 times on deadlock: if not updated, then throw a runtime exception to roll back the vm start  
						
						 
						
						
						
						
					 
					
						2011-09-12 18:20:23 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							82fcfe8edc 
							
						 
					 
					
						
						
							
							make signature calculation consistent across management servers  
						
						 
						
						
						
						
					 
					
						2011-09-12 18:20:23 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							37b4384990 
							
						 
					 
					
						
						
							
							retry a transaction if it deadlocks  
						
						 
						
						
						
						
					 
					
						2011-09-12 18:20:23 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							cfbbe4c031 
							
						 
					 
					
						
						
							
							fix perf. issue in deploy vm. also remove dead code in dao  
						
						 
						
						
						
						
					 
					
						2011-09-12 18:20:23 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							c21a214372 
							
						 
					 
					
						
						
							
							if true, this could lead to the dog chasing its own tail  
						
						 
						
						
						
						
					 
					
						2011-09-12 18:20:23 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							5dba8cf430 
							
						 
					 
					
						
						
							
							only update sequence number when asked to. full sync SHOULD NOT request sequence number updates since this will lead to the dog chasing its own tail  
						
						 
						
						
						
						
					 
					
						2011-09-12 18:20:23 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							6252d605c1 
							
						 
					 
					
						
						
							
							Avoid going back to the nics table for information we already have  
						
						 
						
						
						
						
					 
					
						2011-09-12 18:20:23 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							d03c5af720 
							
						 
					 
					
						
						
							
							make instance_id unique to allow usage of ON DUPLICATE KEY  
						
						 
						
						... 
						
						
						
						useful logging
Reduce batch size to 16 to avoid sql errors
try using multi inserts to overcome deadlock during batch update 
						
						
					 
					
						2011-09-12 18:20:23 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							7e2c2c627f 
							
						 
					 
					
						
						
							
							unit test for SG mgr v2  
						
						 
						
						
						
						
					 
					
						2011-09-12 18:20:22 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							b52d1157e9 
							
						 
					 
					
						
						
							
							use the new implementation of SG manager  
						
						 
						
						
						
						
					 
					
						2011-09-12 18:20:22 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							4cd6a9217c 
							
						 
					 
					
						
						
							
							Use hashset since it is 50% faster. we can use treeset when we support priority  
						
						 
						
						
						
						
					 
					
						2011-09-12 18:20:22 -07:00