Alex Huang
							
						 
					 | 
					
						
						
						
						
							
						
						
							bb06bc3d57
							
						
					 | 
					
						
						
							
							fixed merge conflict
						
						
						
						
						
						
					 | 
					
						2010-08-23 15:10:08 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Huang
							
						 
					 | 
					
						
						
						
						
							
						
						
							e0165dd2ef
							
						
					 | 
					
						
						
							
							my changes
						
						
						
						
						
						
					 | 
					
						2010-08-23 13:59:23 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Kelven Yang
							
						 
					 | 
					
						
						
						
						
							
						
						
							08ae56d360
							
						
					 | 
					
						
						
							
							Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss
						
						
						
						
						
						
						
						Conflicts:
	api/src/com/cloud/hypervisor/Hypervisor.java
	build/build-cloud.xml 
						
						
					 | 
					
						2010-08-23 12:12:45 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Kelven Yang
							
						 
					 | 
					
						
						
						
						
							
						
						
							7bcff5acf3
							
						
					 | 
					
						
						
							
							Vmware incremental check-in
						
						
						
						
						
						
					 | 
					
						2010-08-20 18:50:33 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Edison Su
							
						 
					 | 
					
						
						
						
						
							
						
						
							bf3db195ed
							
						
					 | 
					
						
						
							
							fix typo
						
						
						
						
						
						
					 | 
					
						2010-08-20 18:51:17 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Huang
							
						 
					 | 
					
						
						
						
						
							
						
						
							4356eb7c26
							
						
					 | 
					
						
						
							
							Start2Command implementation for xenserver
						
						
						
						
						
						
					 | 
					
						2010-08-20 13:35:08 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Kelven Yang
							
						 
					 | 
					
						
						
						
						
							
						
						
							ff02e07a33
							
						
					 | 
					
						
						
							
							Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss
						
						
						
						
						
						
					 | 
					
						2010-08-18 21:44:37 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Kelven Yang
							
						 
					 | 
					
						
						
						
						
							
						
						
							792fdf91b8
							
						
					 | 
					
						
						
							
							1) Add host_master table for tracking VMWare vShpere servers
						
						
						
						
						
						
						
						2) Add SynchronizationEvent for in-process event synchronization
3) Move VMware files out of FOSS code base 
						
						
					 | 
					
						2010-08-18 17:30:11 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Huang
							
						 
					 | 
					
						
						
						
						
							
						
						
							b250b985ec
							
						
					 | 
					
						
						
							
							changes
						
						
						
						
						
						
					 | 
					
						2010-08-18 12:19:22 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Huang
							
						 
					 | 
					
						
						
						
						
							
						
						
							e077b23d98
							
						
					 | 
					
						
						
							
							stupid git
						
						
						
						
						
						
					 | 
					
						2010-08-17 10:26:34 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Huang
							
						 
					 | 
					
						
						
						
						
							
						
						
							a89aad4d15
							
						
					 | 
					
						
						
							
							removed override
						
						
						
						
						
						
					 | 
					
						2010-08-17 10:16:16 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Huang
							
						 
					 | 
					
						
						
						
						
							
						
						
							c5f822ca7a
							
						
					 | 
					
						
						
							
							Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss
						
						
						
						
						
						
					 | 
					
						2010-08-16 11:30:22 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Huang
							
						 
					 | 
					
						
						
						
						
							
						
						
							867b43dcf9
							
						
					 | 
					
						
						
							
							more changes for the rewrite.
						
						
						
						
						
						
					 | 
					
						2010-08-16 11:28:11 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								unknown
							
						 
					 | 
					
						
						
						
						
							
						
						
							30c5352f20
							
						
					 | 
					
						
						
							
							- dos2unix deploy-db-dev.sh
						
						
						
						
						
						
					 | 
					
						2010-08-12 17:19:30 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Manuel Amador (Rudd-O)
							
						 
					 | 
					
						
						
						
						
							
						
						
							ac730ec496
							
						
					 | 
					
						
						
							
							Branch 2.1.refactor committed
						
						
						
						
						
						
					 | 
					
						2010-08-11 09:13:42 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Manuel Amador (Rudd-O)
							
						 
					 | 
					
						
						
						
						
							
						
						
							05c020e1f6
							
						
					 | 
					
						
						
							
							Source code committed
						
						
						
						
						
						
					 | 
					
						2010-08-11 09:13:29 -07:00 | 
					
					
						
						
							
							
							
						
					 |