Edison Su
							
						 
					 | 
					
						
						
						
						
							
						
						
							1d2a084bbe
							
						
					 | 
					
						
						
							
							add jna dependenc
						
						
						
						
						
						
					 | 
					
						2011-09-13 18:52:48 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								frank
							
						 
					 | 
					
						
						
						
						
							
						
						
							6aaf3d5ae0
							
						
					 | 
					
						
						
							
							Merge branch 'cvm'
						
						
						
						
						
						
						
						Conflicts:
	api/src/com/cloud/api/BaseCmd.java
	api/src/com/cloud/storage/Storage.java
	cloud.spec
	core/src/com/cloud/storage/template/DownloadManagerImpl.java
	server/src/com/cloud/agent/manager/AgentManagerImpl.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/deploy/FirstFitPlanner.java
	server/src/com/cloud/host/dao/HostDao.java
	server/src/com/cloud/storage/StorageManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/src/com/cloud/vm/VirtualMachineManagerImpl.java
	utils/src/com/cloud/utils/SerialVersionUID.java 
						
						
					 | 
					
						2011-08-08 14:14:09 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Edison Su
							
						 
					 | 
					
						
						
						
						
							
						
						
							6b18b5804b
							
						
					 | 
					
						
						
							
							add one more dependence
						
						
						
						
						
						
					 | 
					
						2011-07-08 13:31:15 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Edison Su
							
						 
					 | 
					
						
						
						
						
							
						
						
							1c67301146
							
						
					 | 
					
						
						
							
							don't include the whole /usr/share/java/ directory in classpath, or you will get stackoverflow, and delete vm data folder after vm stopped
						
						
						
						
						
						
					 | 
					
						2011-07-08 13:31:00 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Frank
							
						 
					 | 
					
						
						
						
						
							
						
						
							b406d1e185
							
						
					 | 
					
						
						
							
							Add cloud-ovm.jar to classpath
						
						
						
						
						
						
					 | 
					
						2011-06-10 18:37:13 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chiradeep Vittal
							
						 
					 | 
					
						
						
						
						
							
						
						
							303e2a7481
							
						
					 | 
					
						
						
							
							Start of zonesfeature / mycloud/cloudkit
						
						
						
						
						
						
					 | 
					
						2011-05-03 10:40:17 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Frank
							
						 
					 | 
					
						
						
						
						
							
						
						
							5cdaa60c50
							
						
					 | 
					
						
						
							
							Use compact format for java implementation version
						
						
						
						
						
						
					 | 
					
						2011-03-21 18:17:24 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Frank
							
						 
					 | 
					
						
						
						
						
							
						
						
							a41fb61ea4
							
						
					 | 
					
						
						
							
							Add miss files and jars for ubuntu
						
						
						
						
						
						
					 | 
					
						2011-03-17 19:08:38 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Frank
							
						 
					 | 
					
						
						
						
						
							
						
						
							ebc366c9f3
							
						
					 | 
					
						
						
							
							Add vmvare-base.jar in classpath
						
						
						
						
						
						
					 | 
					
						2011-02-15 18:21:32 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								anthony
							
						 
					 | 
					
						
						
						
						
							
						
						
							19e7387702
							
						
					 | 
					
						
						
							
							build fix
						
						
						
						
						
						
					 | 
					
						2011-01-28 19:19:53 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Edison Su
							
						 
					 | 
					
						
						
						
						
							
						
						
							d84acb204e
							
						
					 | 
					
						
						
							
							fix centos build
						
						
						
						
						
						
					 | 
					
						2011-01-08 12:07:11 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Edison Su
							
						 
					 | 
					
						
						
						
						
							
						
						
							b331f7bb8d
							
						
					 | 
					
						
						
							
							add missing config files
						
						
						
						
						
						
					 | 
					
						2011-01-06 12:16:58 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Edison Su
							
						 
					 | 
					
						
						
						
						
							
						
						
							daea474baa
							
						
					 | 
					
						
						
							
							fix build
						
						
						
						
						
						
					 | 
					
						2011-01-07 08:31:26 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Edison Su
							
						 
					 | 
					
						
						
						
						
							
						
						
							a0ce28b769
							
						
					 | 
					
						
						
							
							one more fix for router gw, and rhel build
						
						
						
						
						
						
					 | 
					
						2011-01-07 08:27:24 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Frank Zhang
							
						 
					 | 
					
						
						
						
						
							
						
						
							c61fbf6fc8
							
						
					 | 
					
						
						
							
							add UI dependent JARs to configure
						
						
						
						
						
						
					 | 
					
						2010-12-10 10:45:21 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Frank Zhang
							
						 
					 | 
					
						
						
						
						
							
						
						
							6ad104f3b2
							
						
					 | 
					
						
						
							
							add version to script files when doing rpm build
						
						
						
						
						
						
					 | 
					
						2010-12-07 18:25:22 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								edison
							
						 
					 | 
					
						
						
						
						
							
						
						
							06663d47e2
							
						
					 | 
					
						
						
							
							fix missing jar files for centos
						
						
						
						
						
						
					 | 
					
						2010-11-30 11:52:22 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								edison
							
						 
					 | 
					
						
						
						
						
							
						
						
							066d94f6f9
							
						
					 | 
					
						
						
							
							Add cloud-tool into FOSS
						
						
						
						
						
						
					 | 
					
						2010-10-26 18:05:28 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								edison
							
						 
					 | 
					
						
						
						
						
							
						
						
							2cb855e359
							
						
					 | 
					
						
						
							
							fix ipallocator package: add correct package name, log file
						
						
						
						
						
						
					 | 
					
						2010-09-29 18:41:54 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Huang
							
						 
					 | 
					
						
						
						
						
							
						
						
							7249f168d5
							
						
					 | 
					
						
						
							
							more file changes
						
						
						
						
						
						
					 | 
					
						2010-09-09 13:27:20 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Manuel Amador (Rudd-O)
							
						 
					 | 
					
						
						
						
						
							
						
						
							b0acdbcf8b
							
						
					 | 
					
						
						
							
							Split out build responsibility into per-project wscript_build files.  Installation of generic directories like bindir, and creation of systemvms, remain in toplevel wscript_build.  Make some waf code useful and reusable in the form of tools.
						
						
						
						
						
						
					 | 
					
						2010-08-31 20:40:17 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Manuel Amador (Rudd-O)
							
						 
					 | 
					
						
						
						
						
							
						
						
							5ecbe461ce
							
						
					 | 
					
						
						
							
							Detect the presence of mkisofs upon build, to use it to generate systemvm
						
						
						
						
						
						
					 | 
					
						2010-08-31 15:17:17 -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)
							
						 
					 | 
					
						
						
						
						
							
						
						
							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 | 
					
					
						
						
							
							
							
						
					 |