prachi 
							
						 
					 
					
						
						
						
						
							
						
						
							49cdc2317b 
							
						 
					 
					
						
						
							
							merge awsapi build script changes to master  
						
						 
						
						
						
						
					 
					
						2012-05-25 14:40:56 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Robert Schweikert 
							
						 
					 
					
						
						
						
						
							
						
						
							5bfb332b48 
							
						 
					 
					
						
						
							
							- Remove Citrix license artifcat from commercial product release  
						
						 
						
						
						
						
					 
					
						2012-05-19 11:13:28 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							318fdbfa89 
							
						 
					 
					
						
						
							
							correctly removing awsapi when clean-tomcat  
						
						 
						
						... 
						
						
						
						Conflicts:
	build/developer.xml 
						
						
					 
					
						2012-05-18 11:10:56 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							10d9e57115 
							
						 
					 
					
						
						
							
							Added cisco.commands.properties to input param for ant build-apidocs target  
						
						 
						
						
						
						
					 
					
						2012-05-16 13:20:07 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							4310a8d9a8 
							
						 
					 
					
						
						
							
							change verison to 3.0.3  
						
						 
						
						
						
						
					 
					
						2012-04-23 10:48:29 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							04ce34daaf 
							
						 
					 
					
						
						
							
							bug CS-14573  
						
						 
						
						... 
						
						
						
						Update EULAs 
						
						
					 
					
						2012-04-19 12:41:15 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								David Nalley 
							
						 
					 
					
						
						
						
						
							
						
						
							859e367380 
							
						 
					 
					
						
						
							
							fixing rpmbuild CS-14509  
						
						 
						
						
						
						
					 
					
						2012-04-16 00:54:44 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							d34ded1784 
							
						 
					 
					
						
						
							
							Change version to 3.0.2  
						
						 
						
						
						
						
					 
					
						2012-04-11 10:40:08 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prasanna Santhanam 
							
						 
					 
					
						
						
						
						
							
						
						
							5c37d144cc 
							
						 
					 
					
						
						
							
							Package management for the python testclient christened Marvin  
						
						 
						
						... 
						
						
						
						$ant package-marvin
will create a packaged source tarball of the testclient that is
redistributable and decoupled from the rest of the cloudstack build
reviewed-by: unittest 
						
						
					 
					
						2012-04-11 18:24:20 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prasanna Santhanam 
							
						 
					 
					
						
						
						
						
							
						
						
							ffc07c413a 
							
						 
					 
					
						
						
							
							removing the dependency of apidocs on simulator  
						
						 
						
						... 
						
						
						
						reviewed-by: Frank Zhang 
						
						
					 
					
						2012-04-11 18:24:20 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								David Nalley 
							
						 
					 
					
						
						
						
						
							
						
						
							d5377b0ae3 
							
						 
					 
					
						
						
							
							more line ending fixes  
						
						 
						
						
						
						
					 
					
						2012-04-06 22:51:32 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							2f634c0913 
							
						 
					 
					
						
						
							
							Switch to Apache license  
						
						 
						
						
						
						
					 
					
						2012-04-03 04:50:05 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							fe950868c3 
							
						 
					 
					
						
						
							
							Make the final switch on console proxy refactoring work. new VNC engine will be in use after this commit  
						
						 
						
						... 
						
						
						
						Reviewed-By: Kelven 
						
						
					 
					
						2012-03-27 14:56:42 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							53aa3cd90b 
							
						 
					 
					
						
						
							
							change ant build version to 3.0.1  
						
						 
						
						
						
						
					 
					
						2012-03-19 13:34:34 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							6a1d7e309d 
							
						 
					 
					
						
						
							
							More fixes to 2.2.x - 3.0 db upgrade  
						
						 
						
						
						
						
					 
					
						2012-03-01 18:31:50 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							8bdf7ae6a7 
							
						 
					 
					
						
						
							
							move all license html to build/license  
						
						 
						
						... 
						
						
						
						reviewed-by: brian
Conflicts:
	build/eula.en.html
	build/eula.html
	build/license/eula.en.html
	build/license/eula.ja.html 
						
						
					 
					
						2012-02-22 14:11:50 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							0945d77b2f 
							
						 
					 
					
						
						
							
							move eula.html to build/  
						
						 
						
						
						
						
					 
					
						2012-02-16 15:06:03 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ewan Mellor 
							
						 
					 
					
						
						
						
						
							
						
						
							22119a33b5 
							
						 
					 
					
						
						
							
							Added build-apidocs-zip build target that generates HTML versions of the  
						
						 
						
						... 
						
						
						
						API docs.  Uses XML/XSLT generation system originally by Abhinandan Prateek
(I think).  CSS updates from Jessica Tomechak.  gen_toc.py and build script
changes by me. 
						
						
					 
					
						2012-02-08 20:40:29 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Robertson 
							
						 
					 
					
						
						
						
						
							
						
						
							113a2f2fe8 
							
						 
					 
					
						
						
							
							Adding automated.sh, removed failed attempt at setting CATALINA_HOME in ant build configuration  
						
						 
						
						
						
						
					 
					
						2012-02-07 08:52:01 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Robertson 
							
						 
					 
					
						
						
						
						
							
						
						
							2df5628bd9 
							
						 
					 
					
						
						
							
							moved automated.xml to automated directory in testClient.  
						
						 
						
						
						
						
					 
					
						2012-02-03 17:32:49 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Robertson 
							
						 
					 
					
						
						
						
						
							
						
						
							4acfc2eb1d 
							
						 
					 
					
						
						
							
							automated testing changes, in addition to an automated.xml  
						
						 
						
						
						
						
					 
					
						2012-02-03 16:59:20 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							925774ef5b 
							
						 
					 
					
						
						
							
							bug 13129: remove unused vmware lib jars  
						
						 
						
						
						
						
					 
					
						2012-02-01 11:30:02 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							52610ffcb3 
							
						 
					 
					
						
						
							
							add copyright header to shell scripts  
						
						 
						
						
						
						
					 
					
						2012-01-11 18:41:53 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							09082642d5 
							
						 
					 
					
						
						
							
							make default version for Acton to 3.0.0  
						
						 
						
						
						
						
					 
					
						2011-12-28 15:25:39 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							21c510fa70 
							
						 
					 
					
						
						
							
							deploy cloud_usage when ant deploydb  
						
						 
						
						
						
						
					 
					
						2011-12-27 16:55:36 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Robertson 
							
						 
					 
					
						
						
						
						
							
						
						
							ebfd69e285 
							
						 
					 
					
						
						
							
							Python based xml test framework ant changes.  
						
						 
						
						
						
						
					 
					
						2011-12-01 14:56:17 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							bcca44e05f 
							
						 
					 
					
						
						
							
							1) Use correct command names in f5/juniper commands.properties file  
						
						 
						
						... 
						
						
						
						2) Fixed API doc to include f5/juniper/netscaler/virtualRouter commands 
						
						
					 
					
						2011-11-29 16:24:43 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							1d268dc23a 
							
						 
					 
					
						
						
							
							fixes problem with a dangling test direct variable name after build  
						
						 
						
						
						
						
					 
					
						2011-11-18 14:25:03 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							cef30956e9 
							
						 
					 
					
						
						
							
							Merge branch 'newagentmgr'  
						
						 
						
						... 
						
						
						
						Conflicts:
	agent-simulator/src/com/cloud/api/commands/ConfigureSimulator.java
	ovm/src/com/cloud/ovm/hypervisor/OvmDiscoverer.java
	server/src/com/cloud/agent/manager/AgentManagerImpl.java
	server/src/com/cloud/capacity/CapacityManagerImpl.java
	server/src/com/cloud/network/F5BigIpManagerImpl.java
	server/src/com/cloud/network/JuniperSrxManagerImpl.java
	server/src/com/cloud/resource/ResourceManagerImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/src/com/cloud/vm/VirtualMachineManagerImpl.java
	utils/src/com/cloud/utils/db/GenericDao.java 
						
						
					 
					
						2011-10-27 11:09:56 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							4e595d04ab 
							
						 
					 
					
						
						
							
							Bug 11522 - New agent manager  
						
						 
						
						... 
						
						
						
						1.load hosts that in maintenance mode because maintenance is no longer an agent status now
2.don't disconnect agent when entering maintenance mode, again it's no longer an agent status now 
						
						
					 
					
						2011-10-19 17:51:20 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							cd929e69fa 
							
						 
					 
					
						
						
							
							correct ant build-apidoc  
						
						 
						
						... 
						
						
						
						use right script path 
						
						
					 
					
						2011-10-18 14:40:28 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							625a601615 
							
						 
					 
					
						
						
							
							correct ant build-apidoc  
						
						 
						
						
						
						
					 
					
						2011-10-18 14:31:33 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							ae83246acb 
							
						 
					 
					
						
						
							
							bug 11600: aquirelock before deleting a volume, which can be aquired by snapshot manager  
						
						 
						
						... 
						
						
						
						status 11600: resolved fixed 
						
						
					 
					
						2011-10-03 16:43:47 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							3947c9a126 
							
						 
					 
					
						
						
							
							Bug 11522 - New agent manager  
						
						 
						
						... 
						
						
						
						Initailize SearchCriteria2 in order to replace search interface of DAO 
						
						
					 
					
						2011-10-03 10:32:27 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							797d5ff9a7 
							
						 
					 
					
						
						
							
							add usage back to spec file  
						
						 
						
						... 
						
						
						
						now FOSS including all stuff 
						
						
					 
					
						2011-09-14 14:59:27 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							2dcdb946d2 
							
						 
					 
					
						
						
							
							fix wrong unittest  
						
						 
						
						
						
						
					 
					
						2011-09-13 11:22:09 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							254fa22cc7 
							
						 
					 
					
						
						
							
							fix the broken system VM build after renaming of some third-party libraries  
						
						 
						
						
						
						
					 
					
						2011-09-06 16:10:28 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							f7924505d3 
							
						 
					 
					
						
						
							
							partly bring usage back to spec file to work around rpm build  
						
						 
						
						
						
						
					 
					
						2011-08-31 17:25:17 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								David Nalley 
							
						 
					 
					
						
						
						
						
							
						
						
							81c376dd5b 
							
						 
					 
					
						
						
							
							updating copyright licenses, including build-usage.xml  
						
						 
						
						
						
						
					 
					
						2011-08-31 16:22:51 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							c826512ada 
							
						 
					 
					
						
						
							
							don't do compilation when deploying ovm  
						
						 
						
						
						
						
					 
					
						2011-08-30 15:43:59 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							4385a3d2de 
							
						 
					 
					
						
						
							
							deploy ovm scripts when deploying server  
						
						 
						
						
						
						
					 
					
						2011-08-30 15:28:05 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							0b010ef9d4 
							
						 
					 
					
						
						
							
							put comipiling jar files to deps.classpath  
						
						 
						
						
						
						
					 
					
						2011-08-30 13:58:22 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							c9e78299d0 
							
						 
					 
					
						
						
							
							add compiling time classpath for testclient target  
						
						 
						
						
						
						
					 
					
						2011-08-30 11:03:33 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							bb1b16c540 
							
						 
					 
					
						
						
							
							merge thridparty to deps  
						
						 
						
						
						
						
					 
					
						2011-08-25 14:32:19 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							6d6cc2ca54 
							
						 
					 
					
						
						
							
							Developer build fix after premium-move to FOSS  
						
						 
						
						
						
						
					 
					
						2011-08-25 10:19:01 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							d36a988d84 
							
						 
					 
					
						
						
							
							move simulator/test to opensource  
						
						 
						
						
						
						
					 
					
						2011-08-24 10:37:30 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							b3478c377e 
							
						 
					 
					
						
						
							
							Full opensource  
						
						 
						
						
						
						
					 
					
						2011-08-23 19:52:19 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							4f8a52f94c 
							
						 
					 
					
						
						
							
							Move VMware/Premium Secondary storage VM to opensource  
						
						 
						
						
						
						
					 
					
						2011-08-23 14:43:39 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							0be1510496 
							
						 
					 
					
						
						
							
							add template for simulator  
						
						 
						
						
						
						
					 
					
						2011-08-16 10:30:51 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							d902d313b7 
							
						 
					 
					
						
						
							
							fixed a template creation bug  
						
						 
						
						... 
						
						
						
						Conflicts:
	server/src/com/cloud/storage/StorageManager.java 
						
						
					 
					
						2011-06-28 19:17:34 -07:00