Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							6b33d114e8 
							
						 
					 
					
						
						
							
							bug 11380: taking VM snapshot is moved to do it at the same time when backup it to secondary storage, wait snapshot MOR really appears in vCenter until we continue.  
						
						 
						
						
						
						
					 
					
						2011-09-13 17:26:19 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							45c595d558 
							
						 
					 
					
						
						
							
							Don't update resource count for system account  
						
						 
						
						
						
						
					 
					
						2011-09-13 16:58:54 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							de9856f1c4 
							
						 
					 
					
						
						
							
							cloudStack - sync UI change from 2.2.y branch to mater branch.  
						
						 
						
						
						
						
					 
					
						2011-09-13 16:00:46 -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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kishan 
							
						 
					 
					
						
						
						
						
							
						
						
							b7214e6202 
							
						 
					 
					
						
						
							
							bug 10626: Modified install sys tmpl script to get templateId from DB using db.properties  
						
						 
						
						... 
						
						
						
						status 10626: resolved fixed 
						
						
					 
					
						2011-09-14 01:08:07 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								David Nalley 
							
						 
					 
					
						
						
						
						
							
						
						
							c4c0e69425 
							
						 
					 
					
						
						
							
							Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss  
						
						 
						
						
						
						
					 
					
						2011-09-13 14:23:35 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								David Nalley 
							
						 
					 
					
						
						
						
						
							
						
						
							62157f2550 
							
						 
					 
					
						
						
							
							updating usage per convo with kishan and frank  
						
						 
						
						
						
						
					 
					
						2011-09-13 14:23:18 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							2dcdb946d2 
							
						 
					 
					
						
						
							
							fix wrong unittest  
						
						 
						
						
						
						
					 
					
						2011-09-13 11:22:09 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							c4efac2083 
							
						 
					 
					
						
						
							
							Added back changed reverted by merge  
						
						 
						
						
						
						
					 
					
						2011-09-13 11:19:48 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							162e5cf50a 
							
						 
					 
					
						
						
							
							storage_ip_address in host table can be NULL  
						
						 
						
						
						
						
					 
					
						2011-09-13 11:15:47 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							c5bc16ef42 
							
						 
					 
					
						
						
							
							XcpServerDiscoverer is only for XenServer  
						
						 
						
						
						
						
					 
					
						2011-09-13 11:11:55 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							0553c543a1 
							
						 
					 
					
						
						
							
							bug 11421: Add missing source cmd for ipassoc.sh  
						
						 
						
						... 
						
						
						
						status 11421: resolved fixed 
						
						
					 
					
						2011-09-13 11:08:32 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							7da10dc158 
							
						 
					 
					
						
						
							
							bug 11403:  
						
						 
						
						... 
						
						
						
						use unique_name to do update 
						
						
					 
					
						2011-09-13 11:08:27 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							7bbe757d5b 
							
						 
					 
					
						
						
							
							Add "Other PV" for kvm, to install pv driver in windows:  
						
						 
						
						... 
						
						
						
						1. create a VM from iso/template whose guest os type is "Windows*"
2. attach a disk to windows VM
3. install virtio disk driver
4. stop the vm, and create template from it, chose guest os type as "Other PV"
5. create vm from the template created at step 4. Then this vm will have virtio disk, and virtio nic. Need to install virtio nic driver after VM booting up. 
						
						
					 
					
						2011-09-13 11:07:47 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							d1cfe58c0f 
							
						 
					 
					
						
						
							
							bug 11412: use "sshkeypair" instead of "keypair" in response name for ssh commands  
						
						 
						
						... 
						
						
						
						status 11412: resolved fixed 
						
						
					 
					
						2011-09-13 11:00:06 -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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							e981546067 
							
						 
					 
					
						
						
							
							add jna as KVM agent dependency  
						
						 
						
						
						
						
					 
					
						2011-09-13 10:10:03 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							9b424a762d 
							
						 
					 
					
						
						
							
							fix compilation of mocks  
						
						 
						
						
						
						
					 
					
						2011-09-13 09:22:52 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kishan 
							
						 
					 
					
						
						
						
						
							
						
						
							7840302c70 
							
						 
					 
					
						
						
							
							bug 11199: Added indexes to upgarde 2211 to 2212 script  
						
						 
						
						... 
						
						
						
						status 11199: resolved fixed 
						
						
					 
					
						2011-09-13 18:01:51 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kishan 
							
						 
					 
					
						
						
						
						
							
						
						
							1b44c0c8f5 
							
						 
					 
					
						
						
							
							bug 11199: Added indexes to tables in cloud_usage DB in create-schema-premium.sql  
						
						 
						
						... 
						
						
						
						status 11199: resolved fixed 
						
						
					 
					
						2011-09-13 17:57:21 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							d461cfbf1b 
							
						 
					 
					
						
						
							
							fix security group rule which not get updated into db, and simulator agents reports the wrong security group to mgt server  
						
						 
						
						
						
						
					 
					
						2011-09-12 19:09:41 -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 
							
						 
					 
					
						
						
						
						
							
						
						
							0aeb45fafc 
							
						 
					 
					
						
						
							
							if sequence number increases but signature does not change, do not reprogram, but rewrite the rule log  
						
						 
						
						
						
						
					 
					
						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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							2fc782b8ba 
							
						 
					 
					
						
						
							
							Add basic Mocks for some managers  
						
						 
						
						
						
						
					 
					
						2011-09-12 18:20:22 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							abf4754503 
							
						 
					 
					
						
						
							
							New security group mgr WIP : memory based queueing  
						
						 
						
						
						
						
					 
					
						2011-09-12 18:20:22 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							9c660c192f 
							
						 
					 
					
						
						
							
							make /root writable in ubuntu  
						
						 
						
						
						
						
					 
					
						2011-09-12 18:08:43 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							f599c8d110 
							
						 
					 
					
						
						
							
							fix kvm build  
						
						 
						
						
						
						
					 
					
						2011-09-12 18:02:42 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							97d788dfc9 
							
						 
					 
					
						
						
							
							Add log for reconfigLB.sh  
						
						 
						
						
						
						
					 
					
						2011-09-12 17:00:53 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							2f3635c312 
							
						 
					 
					
						
						
							
							add sudo when configuring ubuntu management server  
						
						 
						
						
						
						
					 
					
						2011-09-12 16:44:32 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							f19e9252a4 
							
						 
					 
					
						
						
							
							use ufw to configure iptable in ubuntu for mgmt server ports  
						
						 
						
						
						
						
					 
					
						2011-09-12 16:44:20 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							f41b352d36 
							
						 
					 
					
						
						
							
							revert egress rules implementation pending review  
						
						 
						
						... 
						
						
						
						Reverts a19212703b9734ebd44ebf55cfdd81ebdc9d7fe4
Reverts 24e4e44b8f0712a37147a3777833de3f9e24829e 
						
						
					 
					
						2011-09-12 14:45:58 -07:00