Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							957547a65f 
							
						 
					 
					
						
						
							
							gson 1.5 is now in  
						
						 
						
						
						
						
					 
					
						2010-11-16 15:22:45 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								will 
							
						 
					 
					
						
						
						
						
							
						
						
							b9fc4137f7 
							
						 
					 
					
						
						
							
							Bug 6988: Fixed issue with queryAsyncJobResult returning jobResults in all String format.  This is to mirror the same way that the async commands are being serialized.  
						
						 
						
						... 
						
						
						
						- Changed client.war to now include all the thirdparty files
- Fixed addVpnUser command to return a vpnuser instead of the response
- Added vmware jar files to the development build. 
						
						
					 
					
						2010-11-04 20:56:28 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							ccd6797c10 
							
						 
					 
					
						
						
							
							include vpn and xenserver stuff in patch  
						
						 
						
						
						
						
					 
					
						2010-11-04 15:06:09 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								edison 
							
						 
					 
					
						
						
						
						
							
						
						
							0b177848fa 
							
						 
					 
					
						
						
							
							add the missing jar for systemvm.zip  
						
						 
						
						
						
						
					 
					
						2010-11-02 19:39:16 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							dadfdc93e3 
							
						 
					 
					
						
						
							
							Added package-tools target to package.xml  
						
						 
						
						
						
						
					 
					
						2010-10-26 13:59:11 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								edison 
							
						 
					 
					
						
						
						
						
							
						
						
							45cff02a03 
							
						 
					 
					
						
						
							
							add missing jar files  
						
						 
						
						
						
						
					 
					
						2010-10-18 11:06:40 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								edison 
							
						 
					 
					
						
						
						
						
							
						
						
							ef600e10b5 
							
						 
					 
					
						
						
							
							Make OSS ANT build using deps folder, other than premium/thirdpart folder, which breaks OSS ANT BUILD  
						
						 
						
						
						
						
					 
					
						2010-10-15 23:44:10 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							f6e0d2dd41 
							
						 
					 
					
						
						
							
							Make system VM work on vmware  
						
						 
						
						
						
						
					 
					
						2010-10-14 17:23:13 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								edison 
							
						 
					 
					
						
						
						
						
							
						
						
							139ff273ff 
							
						 
					 
					
						
						
							
							fix systemvm template for kvm, using chiradeep's latest debian template  
						
						 
						
						
						
						
					 
					
						2010-10-05 20:41:39 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								edison 
							
						 
					 
					
						
						
						
						
							
						
						
							9e0f57bc0e 
							
						 
					 
					
						
						
							
							change code for new UI  
						
						 
						
						
						
						
					 
					
						2010-09-29 18:40:52 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							42986f43ba 
							
						 
					 
					
						
						
							
							removed service offering from storageallocator  
						
						 
						
						
						
						
					 
					
						2010-09-24 10:27:02 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							7249f168d5 
							
						 
					 
					
						
						
							
							more file changes  
						
						 
						
						
						
						
					 
					
						2010-09-09 13:27:20 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							51dd7d908f 
							
						 
					 
					
						
						
							
							remove duplicate copy  
						
						 
						
						
						
						
					 
					
						2010-08-30 16:51:33 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Anthony Xu 
							
						 
					 
					
						
						
						
						
							
						
						
							d72e0538da 
							
						 
					 
					
						
						
							
							Revert "Revert "use iso to patch systemvm""  
						
						 
						
						... 
						
						
						
						This reverts commit 145e2e0aaa9b57286102664787e8e40ad3d75e26. 
						
						
					 
					
						2010-08-26 16:06:28 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Anthony Xu 
							
						 
					 
					
						
						
						
						
							
						
						
							145e2e0aaa 
							
						 
					 
					
						
						
							
							Revert "use iso to patch systemvm"  
						
						 
						
						... 
						
						
						
						This reverts commit 3565f8d21b331745b99ce3a09a35d642f2f7bcfe. 
						
						
					 
					
						2010-08-26 16:03:34 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								root 
							
						 
					 
					
						
						
						
						
							
						
						
							3565f8d21b 
							
						 
					 
					
						
						
							
							use iso to patch systemvm  
						
						 
						
						... 
						
						
						
						Conflicts:
	core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
	scripts/vm/hypervisor/xenserver/xenserver56/patch 
						
						
					 
					
						2010-08-26 15:56:02 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							45cb68e7e2 
							
						 
					 
					
						
						
							
							add templates.vmware.sql  
						
						 
						
						... 
						
						
						
						modify build to deploy vmware database records 
						
						
					 
					
						2010-08-24 22:58:05 -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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Manuel Amador (Rudd-O) 
							
						 
					 
					
						
						
						
						
							
						
						
							b9e600ed53 
							
						 
					 
					
						
						
							
							Remove the unnecessary excludes from build-ui  
						
						 
						
						
						
						
					 
					
						2010-08-20 13:21:19 -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 
							
						 
					 
					
						
						
						
						
							
						
						
							417a3c8c18 
							
						 
					 
					
						
						
							
							bug 5764: More changes  
						
						 
						
						
						
						
					 
					
						2010-08-19 11:27:30 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							afc0adf28a 
							
						 
					 
					
						
						
							
							security checker  
						
						 
						
						
						
						
					 
					
						2010-08-19 09:23:03 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							b250b985ec 
							
						 
					 
					
						
						
							
							changes  
						
						 
						
						
						
						
					 
					
						2010-08-18 12:19:22 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							53097c67f5 
							
						 
					 
					
						
						
							
							1) Fix build problem caused by alex's Refactoring  
						
						 
						
						... 
						
						
						
						2) Let console proxy servlet support API key to allow session-less access 
						
						
					 
					
						2010-08-17 15:15:06 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							a89aad4d15 
							
						 
					 
					
						
						
							
							removed override  
						
						 
						
						
						
						
					 
					
						2010-08-17 10:16:16 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							c21bc7072c 
							
						 
					 
					
						
						
							
							more changes  
						
						 
						
						
						
						
					 
					
						2010-08-16 11:30:04 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							867b43dcf9 
							
						 
					 
					
						
						
							
							more changes for the rewrite.  
						
						 
						
						
						
						
					 
					
						2010-08-16 11:28:11 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							7f40fe0e07 
							
						 
					 
					
						
						
							
							not overwritten  
						
						 
						
						
						
						
					 
					
						2010-08-11 22:14:44 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							066f24dd4e 
							
						 
					 
					
						
						
							
							Changed the version number to use the date time.  This way developer can still figure out which file they should look at.  
						
						 
						
						
						
						
					 
					
						2010-08-11 22:13:53 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							eb28cbca63 
							
						 
					 
					
						
						
							
							more crap to fix git  
						
						 
						
						
						
						
					 
					
						2010-08-11 16:23:46 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							49ec1136a2 
							
						 
					 
					
						
						
							
							ignore files  
						
						 
						
						
						
						
					 
					
						2010-08-11 11:31:22 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							621a37b6c8 
							
						 
					 
					
						
						
							
							bug 5890: Changed all of the build stuff to work better with git  
						
						 
						
						
						
						
					 
					
						2010-08-11 11:16:29 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Manuel Amador (Rudd-O) 
							
						 
					 
					
						
						
						
						
							
						
						
							5fdeefb4da 
							
						 
					 
					
						
						
							
							build number file does not belong in the repo.  ignored and deleted.  
						
						 
						
						
						
						
					 
					
						2010-08-11 11:14:52 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							e6c41146f7 
							
						 
					 
					
						
						
							
							bug 5890,5873: Try multiple bug checkins  
						
						 
						
						... 
						
						
						
						status 5890: resolved fixed
status 5873: resolved invalid 
						
						
					 
					
						2010-08-11 09:59:25 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Manuel Amador (Rudd-O) 
							
						 
					 
					
						
						
						
						
							
						
						
							9d5c1f2dcf 
							
						 
					 
					
						
						
							
							Fix build system in preparation for repo split  
						
						 
						
						
						
						
					 
					
						2010-08-11 09:13:29 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Manuel Amador (Rudd-O) 
							
						 
					 
					
						
						
						
						
							
						
						
							05c020e1f6 
							
						 
					 
					
						
						
							
							Source code committed  
						
						 
						
						
						
						
					 
					
						2010-08-11 09:13:29 -07:00