Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							6d6b74fdfa 
							
						 
					 
					
						
						
							
							Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss  
						
						 
						
						
						
						
					 
					
						2010-08-24 11:24:05 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Anthony Xu 
							
						 
					 
					
						
						
						
						
							
						
						
							5fb852f0ca 
							
						 
					 
					
						
						
							
							fix build, add XenServerResource.java  
						
						 
						
						
						
						
					 
					
						2010-08-24 10:21:41 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							fb389e8cd6 
							
						 
					 
					
						
						
							
							Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss  
						
						 
						
						
						
						
					 
					
						2010-08-24 00:01:09 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							20b26082db 
							
						 
					 
					
						
						
							
							bug 5764: changing from networkoffering to network profile  
						
						 
						
						
						
						
					 
					
						2010-08-24 00:00:43 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							aa49f9f98b 
							
						 
					 
					
						
						
							
							Initial checkin of systemvm builder for debian-based systemvm  
						
						 
						
						
						
						
					 
					
						2010-08-23 18:40:06 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Anthony Xu 
							
						 
					 
					
						
						
						
						
							
						
						
							55e425361d 
							
						 
					 
					
						
						
							
							Merge branch 'lmaster'  
						
						 
						
						
						
						
					 
					
						2010-08-23 18:13:33 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Anthony Xu 
							
						 
					 
					
						
						
						
						
							
						
						
							0366dd093c 
							
						 
					 
					
						
						
							
							use slaveconnection instead of masterconnection for all host plugin calls.  
						
						 
						
						... 
						
						
						
						tested by creating domr and user vm and migrating them
1. if you add host for kvm , you need specify kvm://ip_address, otherwiset there is no to differ kvm and xenserver hosts, edison cloud you please test this, may need some minor fixes.
2. if you want to session inside your plugin call, you can not use the one which is passed in, due to it is a slavesession, you need to call get_xapi_session() to get a new local session and use it. I have modified some of these, I may ignore some. Please let me know if you see XENAPI_PLUGIN_EXCEPTION. 
						
						
					 
					
						2010-08-23 18:01:39 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								abhishek 
							
						 
					 
					
						
						
						
						
							
						
						
							67e1eee981 
							
						 
					 
					
						
						
							
							Adding to migration script  
						
						 
						
						
						
						
					 
					
						2010-08-23 16:27:40 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								abhishek 
							
						 
					 
					
						
						
						
						
							
						
						
							7f771cbe24 
							
						 
					 
					
						
						
							
							bug 5883: Final checkin for volume lineage  
						
						 
						
						... 
						
						
						
						status 5853: RESOLVED FIXED 
						
						
					 
					
						2010-08-23 16:17:18 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								abhishek 
							
						 
					 
					
						
						
						
						
							
						
						
							87f8c3449f 
							
						 
					 
					
						
						
							
							Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss  
						
						 
						
						
						
						
					 
					
						2010-08-23 16:04:16 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								abhishek 
							
						 
					 
					
						
						
						
						
							
						
						
							7454f0f24a 
							
						 
					 
					
						
						
							
							Incremental checkin for volume lineage  
						
						 
						
						
						
						
					 
					
						2010-08-23 16:02:45 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							e91617bc6f 
							
						 
					 
					
						
						
							
							Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss  
						
						 
						
						
						
						
					 
					
						2010-08-23 15:10:15 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							bb06bc3d57 
							
						 
					 
					
						
						
							
							fixed merge conflict  
						
						 
						
						
						
						
					 
					
						2010-08-23 15:10:08 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Manuel Amador (Rudd-O) 
							
						 
					 
					
						
						
						
						
							
						
						
							a9a22c7c81 
							
						 
					 
					
						
						
							
							fedora 12 is the test for dependency of cloud-qemu  
						
						 
						
						
						
						
					 
					
						2010-08-23 15:02:24 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							7a46156d09 
							
						 
					 
					
						
						
							
							Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss  
						
						 
						
						
						
						
					 
					
						2010-08-23 14:17:18 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							8eb1e27b3c 
							
						 
					 
					
						
						
							
							Update eclipse project classpath file to work with renamed vmware jar files  
						
						 
						
						
						
						
					 
					
						2010-08-23 14:16:43 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								abhishek 
							
						 
					 
					
						
						
						
						
							
						
						
							27b038efcb 
							
						 
					 
					
						
						
							
							Correcting hypervisor type enum  
						
						 
						
						
						
						
					 
					
						2010-08-23 14:07:35 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							e0165dd2ef 
							
						 
					 
					
						
						
							
							my changes  
						
						 
						
						
						
						
					 
					
						2010-08-23 13:59:23 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								root 
							
						 
					 
					
						
						
						
						
							
						
						
							d2ffa6b68d 
							
						 
					 
					
						
						
							
							bug 5781: also reduce the scope of the global lock when updating storage capacity.  
						
						 
						
						
						
						
					 
					
						2010-08-23 13:41:22 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kris McQueen 
							
						 
					 
					
						
						
						
						
							
						
						
							adce18b2c0 
							
						 
					 
					
						
						
							
							[merge from 2.1.x] Bug 5781: Only grab capacity global lock when accessing capacity tables.  Once the queries are done, release the lock so that others can query for the data or update the data as needed.  
						
						 
						
						
						
						
					 
					
						2010-08-23 13:41:03 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							f98e272d48 
							
						 
					 
					
						
						
							
							Remove an incorrect usage of @inject, it caused management server from being loaded  
						
						 
						
						
						
						
					 
					
						2010-08-23 12:25:47 -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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kishan 
							
						 
					 
					
						
						
						
						
							
						
						
							89cd3131bf 
							
						 
					 
					
						
						
							
							add zone id for create template event  
						
						 
						
						
						
						
					 
					
						2010-08-23 17:19:31 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							7bcff5acf3 
							
						 
					 
					
						
						
							
							Vmware incremental check-in  
						
						 
						
						
						
						
					 
					
						2010-08-20 18:50:33 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jessica 
							
						 
					 
					
						
						
						
						
							
						
						
							c17cda2a37 
							
						 
					 
					
						
						
							
							resolve failed merge markers  
						
						 
						
						
						
						
					 
					
						2010-08-20 18:15:24 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							65b9f29941 
							
						 
					 
					
						
						
							
							Issue #: 5975  
						
						 
						
						... 
						
						
						
						(1) API-side: make listDomains, ListDomainChildren return all items
(2) UI-side: make domains page show all domains by specifying pageSize=-1 
						
						
					 
					
						2010-08-20 17:39:40 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jessica 
							
						 
					 
					
						
						
						
						
							
						
						
							440662c938 
							
						 
					 
					
						
						
							
							Issue #: 5986  
						
						 
						
						... 
						
						
						
						Volume page - grid - make action links stay left-aligned 
						
						
					 
					
						2010-08-20 17:31:59 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							bf3db195ed 
							
						 
					 
					
						
						
							
							fix typo  
						
						 
						
						
						
						
					 
					
						2010-08-20 18:51:17 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							4cda798057 
							
						 
					 
					
						
						
							
							Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss  
						
						 
						
						
						
						
					 
					
						2010-08-20 14:51:48 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Manuel Amador (Rudd-O) 
							
						 
					 
					
						
						
						
						
							
						
						
							40a78f166e 
							
						 
					 
					
						
						
							
							build-cloud.xml build-cloud FAILS until now.  It had references to files in directories that were moved.  
						
						 
						
						
						
						
					 
					
						2010-08-20 14:02:41 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							0f7a7f0879 
							
						 
					 
					
						
						
							
							merge  
						
						 
						
						
						
						
					 
					
						2010-08-20 13:38:24 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							4356eb7c26 
							
						 
					 
					
						
						
							
							Start2Command implementation for xenserver  
						
						 
						
						
						
						
					 
					
						2010-08-20 13:35:08 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Manuel Amador (Rudd-O) 
							
						 
					 
					
						
						
						
						
							
						
						
							b9e600ed53 
							
						 
					 
					
						
						
							
							Remove the unnecessary excludes from build-ui  
						
						 
						
						
						
						
					 
					
						2010-08-20 13:21:19 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Manuel Amador (Rudd-O) 
							
						 
					 
					
						
						
						
						
							
						
						
							6b08c8afc3 
							
						 
					 
					
						
						
							
							Add thirdparty jars because otherwise the premium parts that do VMWare do not compile  
						
						 
						
						
						
						
					 
					
						2010-08-20 13:07:16 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Manuel Amador (Rudd-O) 
							
						 
					 
					
						
						
						
						
							
						
						
							ea58879032 
							
						 
					 
					
						
						
							
							Remove build.number  
						
						 
						
						
						
						
					 
					
						2010-08-20 13:06:40 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Manuel Amador (Rudd-O) 
							
						 
					 
					
						
						
						
						
							
						
						
							eae268d5d9 
							
						 
					 
					
						
						
							
							Undo unnecessary reformatting that is complicating the merges  
						
						 
						
						
						
						
					 
					
						2010-08-20 12:24:59 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							f0b82f8565 
							
						 
					 
					
						
						
							
							move source of resource properties from UI folder to client folder  
						
						 
						
						... 
						
						
						
						move source of resource properties from UI folder to client folder
move source of resource properties from UI folder to client folder 
						
						
					 
					
						2010-08-20 12:08:47 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							24ccf442b0 
							
						 
					 
					
						
						
							
							Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss  
						
						 
						
						
						
						
					 
					
						2010-08-19 11:28:05 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							417a3c8c18 
							
						 
					 
					
						
						
							
							bug 5764: More changes  
						
						 
						
						
						
						
					 
					
						2010-08-19 11:27:30 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Manuel Amador (Rudd-O) 
							
						 
					 
					
						
						
						
						
							
						
						
							04d0feb475 
							
						 
					 
					
						
						
							
							Gitignore ignores pyc ocmpiled files and build.number  
						
						 
						
						
						
						
					 
					
						2010-08-19 10:57:16 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Manuel Amador (Rudd-O) 
							
						 
					 
					
						
						
						
						
							
						
						
							e94d21be0f 
							
						 
					 
					
						
						
							
							Remove cloud_utils.pyc  
						
						 
						
						
						
						
					 
					
						2010-08-19 10:50:39 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Manuel Amador (Rudd-O) 
							
						 
					 
					
						
						
						
						
							
						
						
							b96544e475 
							
						 
					 
					
						
						
							
							read_properties imported from cloud_utils  
						
						 
						
						
						
						
					 
					
						2010-08-19 10:50:38 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Manuel Amador (Rudd-O) 
							
						 
					 
					
						
						
						
						
							
						
						
							dc1d43815f 
							
						 
					 
					
						
						
							
							Requires of cloud-qemu-system-x86 correct  
						
						 
						
						
						
						
					 
					
						2010-08-19 10:50:38 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							afc0adf28a 
							
						 
					 
					
						
						
							
							security checker  
						
						 
						
						
						
						
					 
					
						2010-08-19 09:23:03 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							52e6f3a85b 
							
						 
					 
					
						
						
							
							Added '/' to gitignore  
						
						 
						
						
						
						
					 
					
						2010-08-19 09:04:10 -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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								edison 
							
						 
					 
					
						
						
						
						
							
						
						
							3106c2ae3f 
							
						 
					 
					
						
						
							
							Issue #: 5954  
						
						 
						
						... 
						
						
						
						Status 5954: resolved fixed
exclude link local gateway 
						
						
					 
					
						2010-08-18 17:44:39 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Anthony Xu 
							
						 
					 
					
						
						
						
						
							
						
						
							41f7c745bd 
							
						 
					 
					
						
						
							
							bug 5934: if it is standalone, give cluser name as Standalone-ip/name  
						
						 
						
						... 
						
						
						
						status 5934: resolved fixed
Conflicts:
	server/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java 
						
						
					 
					
						2010-08-18 17:33:25 -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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Anthony Xu 
							
						 
					 
					
						
						
						
						
							
						
						
							09680d80a7 
							
						 
					 
					
						
						
							
							bug 5939: add the new script to patch  
						
						 
						
						... 
						
						
						
						status 5939: assigned 
						
						
					 
					
						2010-08-18 16:59:04 -07:00