Darren Shepherd 
							
						 
					 
					
						
						
						
						
							
						
						
							e3280bdba2 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/spring-modularization'  
						
						... 
						
						
						
						Conflicts:
	client/tomcatconf/applicationContext.xml.in
	client/tomcatconf/nonossComponentContext.xml.in
	client/tomcatconf/simulatorComponentContext.xml.in
	framework/db/src/com/cloud/utils/db/Transaction.java
	plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockAgentManagerImpl.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java 
						
						
					 
					
						2013-10-23 11:14:42 -07:00 
						 
				 
			
				
					
						
							
							
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							3f583684c6 
							
						 
					 
					
						
						
							
							Temporary fix for the chicken and egg problem when making changes to the configuration database.  
						
						
						
						
					 
					
						2013-10-03 12:36:34 +02:00 
						 
				 
			
				
					
						
							
							
								Darren Shepherd 
							
						 
					 
					
						
						
						
						
							
						
						
							67186429e1 
							
						 
					 
					
						
						
							
							Spring Modularization  
						
						... 
						
						
						
						ACS is now comprised of a hierarchy of spring application contexts.
Each plugin can contribute configuration files to add to an existing
module or create it's own module.
Additionally, for the mgmt server, ACS custom AOP is no longer used
and instead we use Spring AOP to manage interceptors. 
						
						
					 
					
						2013-10-02 15:41:04 -07:00 
						 
				 
			
				
					
						
							
							
								Darren Shepherd 
							
						 
					 
					
						
						
						
						
							
						
						
							aed5e9dc2a 
							
						 
					 
					
						
						
							
							Add Manage Context framework  
						
						... 
						
						
						
						The managed context framework provides a simple way to add logic
to ACS at the various entry points of the system.  As threads are
launched and ran listeners can be registered for onEntry or onLeave
of the managed context.  This framework will be used specifically
to handle DB transaction checking and setting up the CallContext.
This framework is need to transition away from ACS custom AOP to
Spring AOP. 
						
						
					 
					
						2013-10-02 13:09:52 -07:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							e8cac2c5d8 
							
						 
					 
					
						
						
							
							Changed SearchCriteria2 to GenericQueryBuilder to reflect the same placement  
						
						
						
						
					 
					
						2013-09-28 07:53:26 -07:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							e2988902c9 
							
						 
					 
					
						
						
							
							Changed SearchCriteria2 to GenericQueryBuilder to reflect the same placement  
						
						
						
						
					 
					
						2013-09-28 07:53:25 -07:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							af8832f6bd 
							
						 
					 
					
						
						
							
							Unified both the SearchBuilder and SearchCriteriaService  
						
						
						
						
					 
					
						2013-09-28 07:53:24 -07:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							5495f10bce 
							
						 
					 
					
						
						
							
							Revert "Reverting the range of commits that broke the build"  
						
						... 
						
						
						
						This reverts commit b59e3aaefced03d40d5b4b63c421c69743bcd387. 
						
						
					 
					
						2013-08-08 15:02:40 -07:00 
						 
				 
			
				
					
						
							
							
								Prasanna Santhanam 
							
						 
					 
					
						
						
						
						
							
						
						
							b59e3aaefc 
							
						 
					 
					
						
						
							
							Reverting the range of commits that broke the build  
						
						... 
						
						
						
						This reverts commits 30c33415..f6a2c817bc
Signed-off-by: Prasanna Santhanam <tsp@apache.org> 
						
						
					 
					
						2013-08-08 14:46:56 +05:30 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							942f282a6e 
							
						 
					 
					
						
						
							
							Moved config into it's own package  
						
						
						
						
					 
					
						2013-08-07 16:41:02 -07:00 
						 
				 
			
				
					
						
							
							
								Chip Childers 
							
						 
					 
					
						
						
						
						
							
						
						
							8225374138 
							
						 
					 
					
						
						
							
							Updating pom.xml version numbers for release 4.3.0-SNAPSHOT  
						
						... 
						
						
						
						Signed-off-by: Chip Childers <chipchilders@apache.org> 
						
						
					 
					
						2013-08-01 10:35:00 -04:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							a4cea4ebf2 
							
						 
					 
					
						
						
							
							Removed schema from the dependency of many components  
						
						
						
						
					 
					
						2013-07-29 10:55:19 -07:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							c2752ba93c 
							
						 
					 
					
						
						
							
							Removed mysql as any dependency  
						
						
						
						
					 
					
						2013-07-26 20:35:48 -07:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							3f7c558de5 
							
						 
					 
					
						
						
							
							Removed all the extra mockito, inject, and junit dependencies.  Changed any test/resource to test/resources and rely on the master pom to tell us where the resources are instead of each individual project  
						
						
						
						
					 
					
						2013-07-26 16:34:08 -07:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							c8cafb91a7 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3818: NFS Cache Improperly Named.  
						
						
						
						
					 
					
						2013-07-26 15:07:45 -07:00 
						 
				 
			
				
					
						
							
							
								Donal Lafferty 
							
						 
					 
					
						
						
						
						
							
						
						
							58f9202818 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3215: Cannot Deploy VM when using S3 object store without NFS Cache  
						
						... 
						
						
						
						Signed-off-by: Edison Su <sudison@gmail.com> 
						
						
					 
					
						2013-06-28 16:52:06 -07:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							a715eb8121 
							
						 
					 
					
						
						
							
							clean up storage related code, and add lru replacement algorithm for cache storage  
						
						
						
						
					 
					
						2013-06-14 15:55:59 -07:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							0a5228922b 
							
						 
					 
					
						
						
							
							clean up storage related coded  
						
						
						
						
					 
					
						2013-05-29 18:04:37 -07:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							3ec52807f1 
							
						 
					 
					
						
						
							
							CLOUDSTACK-2593: fix migrate volume between pools through secondary storage  
						
						
						
						
					 
					
						2013-05-23 18:26:16 -07:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							2af36aa87b 
							
						 
					 
					
						
						
							
							Clean up template_zone_ref entries in case of create template failure.  
						
						
						
						
					 
					
						2013-05-21 12:00:59 -07:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							389d7c1fa0 
							
						 
					 
					
						
						
							
							if object is already stored in cache store, don't download again  
						
						
						
						
					 
					
						2013-05-16 14:34:06 -07:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							f8e51f70a1 
							
						 
					 
					
						
						
							
							Invoke reatetmplt.sh script after copying template from S3 to cache  
						
						... 
						
						
						
						storage. 
						
						
					 
					
						2013-05-11 18:19:29 -07:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							dc5d2f45e9 
							
						 
					 
					
						
						
							
							Make copyFromS3ToNFS flow work.  
						
						
						
						
					 
					
						2013-05-08 17:39:46 -07:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							2d544e7127 
							
						 
					 
					
						
						
							
							volume related operation works  
						
						
						
						
					 
					
						2013-05-06 18:27:15 -07:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							2f689171e0 
							
						 
					 
					
						
						
							
							refactor snapshot  
						
						
						
						
					 
					
						2013-04-29 18:51:14 -07:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							b8c5c67fbc 
							
						 
					 
					
						
						
							
							add copycommand at resouce side  
						
						
						
						
					 
					
						2013-04-22 19:12:50 -07:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							abf40435f3 
							
						 
					 
					
						
						
							
							refactor downloadlistener, sync system vm templates when adding a new image store  
						
						
						
						
					 
					
						2013-04-21 22:46:02 -07:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							1fe5d7c886 
							
						 
					 
					
						
						
							
							need to download image to cache storage from s3/swift on mgt server for default system vm templates  
						
						
						
						
					 
					
						2013-04-18 01:56:34 -07:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							b81fa6d9ea 
							
						 
					 
					
						
						
							
							add copy template to cache store  
						
						
						
						
					 
					
						2013-04-12 16:03:30 -07:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							1c448cd6e3 
							
						 
					 
					
						
						
							
							add cache storage  
						
						
						
						
					 
					
						2013-04-11 11:01:29 -07:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							e5bf38ed05 
							
						 
					 
					
						
						
							
							add cache storage  
						
						
						
						
					 
					
						2013-04-11 10:52:53 -07:00