Alena Prokharchyk
							
						 
					 | 
					
						
						
						
						
							
						
						
							3ae80acb40
							
						
					 | 
					
						
						
							
							Added missing license to SearchBase.java - fixed broken RAT check
						
						
						
						
						
						
					 | 
					
						2013-09-28 22:18:27 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Huang
							
						 
					 | 
					
						
						
						
						
							
						
						
							b998fba4da
							
						
					 | 
					
						
						
							
							Added comments for the search builder classes on how to use them
						
						
						
						
						
						
					 | 
					
						2013-09-28 11:50:02 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Huang
							
						 
					 | 
					
						
						
						
						
							
						
						
							b60eef3e82
							
						
					 | 
					
						
						
							
							Added comments and finished off the work
						
						
						
						
						
						
					 | 
					
						2013-09-28 07:53:28 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Huang
							
						 
					 | 
					
						
						
						
						
							
						
						
							5fd47cc873
							
						
					 | 
					
						
						
							
							Added QueryBuilder
						
						
						
						
						
						
					 | 
					
						2013-09-28 07:53:28 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Huang
							
						 
					 | 
					
						
						
						
						
							
						
						
							38e69fb9f9
							
						
					 | 
					
						
						
							
							Changed SearchCriteria2 to GenericQueryBuilder to reflect the same placement
						
						
						
						
						
						
					 | 
					
						2013-09-28 07:53:27 -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
							
						 
					 | 
					
						
						
						
						
							
						
						
							a964cf549e
							
						
					 | 
					
						
						
							
							Continue to merge SearchCriteria2 and GenericSearchBuilder
						
						
						
						
						
						
					 | 
					
						2013-09-28 07:53:24 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Huang
							
						 
					 | 
					
						
						
						
						
							
						
						
							af8832f6bd
							
						
					 | 
					
						
						
							
							Unified both the SearchBuilder and SearchCriteriaService
						
						
						
						
						
						
					 | 
					
						2013-09-28 07:53:24 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Huang
							
						 
					 | 
					
						
						
						
						
							
						
						
							3e813ce61d
							
						
					 | 
					
						
						
							
							Committing review 13891.
						
						
						
						
						
						
					 | 
					
						2013-09-23 14:59:58 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Huang
							
						 
					 | 
					
						
						
						
						
							
						
						
							bf6a5ff023
							
						
					 | 
					
						
						
							
							Added a ManagementServer scope but it isn't used yet.  Added @Deprecated to one of the constructors
						
						
						
						
						
						
					 | 
					
						2013-09-18 09:34:24 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Kelven Yang
							
						 
					 | 
					
						
						
						
						
							
						
						
							5820b071b8
							
						
					 | 
					
						
						
							
							CLOUDSTACK-4659: Add the missing feature back for GC VMware worker VMs
						
						
						
						
						
						
					 | 
					
						2013-09-17 14:06:52 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Huang
							
						 
					 | 
					
						
						
						
						
							
						
						
							a05ec6df33
							
						
					 | 
					
						
						
							
							Fixed up the agent separation.  Added comments for config packaging.
						
						
						
						
						
						
					 | 
					
						2013-09-06 15:40:39 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Huang
							
						 
					 | 
					
						
						
						
						
							
						
						
							1f5699b29f
							
						
					 | 
					
						
						
							
							Fixed unit tests
						
						
						
						
						
						
					 | 
					
						2013-09-06 15:40:39 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Huang
							
						 
					 | 
					
						
						
						
						
							
						
						
							8f556e6d88
							
						
					 | 
					
						
						
							
							Made changes to configuration.  Eliminated ConfigValue and only use ConfigKey
						
						
						
						
						
						
					 | 
					
						2013-09-06 15:40:38 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Huang
							
						 
					 | 
					
						
						
						
						
							
						
						
							b8e79c30a8
							
						
					 | 
					
						
						
							
							Compile complete
						
						
						
						
						
						
					 | 
					
						2013-09-06 15:40:37 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Huang
							
						 
					 | 
					
						
						
						
						
							
						
						
							5b439f0748
							
						
					 | 
					
						
						
							
							Revert "Revert "Added missing files""
						
						
						
						
						
						
						
						This reverts commit 48053001fb2303d4acfb77d23fe3733941e83781. 
						
						
					 | 
					
						2013-09-06 15:40:35 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Huang
							
						 
					 | 
					
						
						
						
						
							
						
						
							06493d5b5c
							
						
					 | 
					
						
						
							
							Revert "Added missing files"
						
						
						
						
						
						
						
						This reverts commit a1dfc227e895d724f68c0206643825b3ba43116c. 
						
						
					 | 
					
						2013-09-06 15:40:35 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Huang
							
						 
					 | 
					
						
						
						
						
							
						
						
							375eadd3d3
							
						
					 | 
					
						
						
							
							Added missing files
						
						
						
						
						
						
					 | 
					
						2013-09-06 15:40:34 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Huang
							
						 
					 | 
					
						
						
						
						
							
						
						
							435e74e914
							
						
					 | 
					
						
						
							
							Commit to try something on removing getZone
						
						
						
						
						
						
					 | 
					
						2013-09-06 15:40:33 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Kelven Yang
							
						 
					 | 
					
						
						
						
						
							
						
						
							249e2e8f59
							
						
					 | 
					
						
						
							
							Correct DAO usage in VmwareDatacenterVO, relax assertion conditions to work with stack calling frame that is not wrapped with @DB injection
						
						
						
						
						
						
					 | 
					
						2013-09-04 14:49:44 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Huang
							
						 
					 | 
					
						
						
						
						
							
						
						
							abbae2aa87
							
						
					 | 
					
						
						
							
							Fixed the problem with offerings and templates.  These two items due to a previous patch all the way back in 2.1.x versions uses the removed column incorrectly.  No one fixed since then.  Hence, there's a bunch of findbyidincludingremoved calls in the cloudstack code around these two items.
						
						
						
						
						
						
					 | 
					
						2013-08-26 17:31:10 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Huang
							
						 
					 | 
					
						
						
						
						
							
						
						
							4ba359c3fe
							
						
					 | 
					
						
						
							
							Moved VirtualMachineManager into engine
						
						
						
						
						
						
					 | 
					
						2013-08-19 14:13:28 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hugo Trippaers
							
						 
					 | 
					
						
						
						
						
							
						
						
							d57796b94f
							
						
					 | 
					
						
						
							
							Fix XML validation errors
						
						
						
						
						
						
					 | 
					
						2013-08-13 08:25:45 +02: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
							
						 
					 | 
					
						
						
						
						
							
						
						
							5287f4c9ec
							
						
					 | 
					
						
						
							
							Got everything running through testing
						
						
						
						
						
						
					 | 
					
						2013-08-07 16:41:06 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Huang
							
						 
					 | 
					
						
						
						
						
							
						
						
							5161ded69c
							
						
					 | 
					
						
						
							
							Removed the configuration parameters from Config.java
						
						
						
						
						
						
					 | 
					
						2013-08-07 16:41:05 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Huang
							
						 
					 | 
					
						
						
						
						
							
						
						
							49cd4fa380
							
						
					 | 
					
						
						
							
							Connected config gathering to CloudStack
						
						
						
						
						
						
					 | 
					
						2013-08-07 16:41:04 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Huang
							
						 
					 | 
					
						
						
						
						
							
						
						
							90cfca0501
							
						
					 | 
					
						
						
							
							Passed the unit test
						
						
						
						
						
						
					 | 
					
						2013-08-07 16:41:03 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Huang
							
						 
					 | 
					
						
						
						
						
							
						
						
							e4f20c7ced
							
						
					 | 
					
						
						
							
							config in place
						
						
						
						
						
						
					 | 
					
						2013-08-07 16:41:03 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Huang
							
						 
					 | 
					
						
						
						
						
							
						
						
							31509cf6da
							
						
					 | 
					
						
						
							
							Added new files
						
						
						
						
						
						
					 | 
					
						2013-08-07 16:41:02 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Huang
							
						 
					 | 
					
						
						
						
						
							
						
						
							942f282a6e
							
						
					 | 
					
						
						
							
							Moved config into it's own package
						
						
						
						
						
						
					 | 
					
						2013-08-07 16:41:02 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Huang
							
						 
					 | 
					
						
						
						
						
							
						
						
							66cca4d9ac
							
						
					 | 
					
						
						
							
							Fixed up the pom.xml to use dependencies specified in cloudstack pom
						
						
						
						
						
						
					 | 
					
						2013-08-02 13:51:47 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Huang
							
						 
					 | 
					
						
						
						
						
							
						
						
							dd0536f9d3
							
						
					 | 
					
						
						
							
							Changed tabs to space
						
						
						
						
						
						
					 | 
					
						2013-08-02 11:07:54 -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
							
						 
					 | 
					
						
						
						
						
							
						
						
							1e1ee902a2
							
						
					 | 
					
						
						
							
							Moved over the new jobs framework from vmsync.  This has not been integrated into the server package yet.  Will do that next
						
						
						
						
						
						
					 | 
					
						2013-07-30 15:00:58 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Huang
							
						 
					 | 
					
						
						
						
						
							
						
						
							3d2e49bcfc
							
						
					 | 
					
						
						
							
							Changed the log4j config files to log org.apache.cloudstack in debug and change the layout format
						
						
						
						
						
						
					 | 
					
						2013-07-26 20:35:49 -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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Huang
							
						 
					 | 
					
						
						
						
						
							
						
						
							f5e5b39c9b
							
						
					 | 
					
						
						
							
							Moved the DB layer code into framework-db and change only the necessary projects to refer to it.  Cut down on the dependencies introduced with all the code in utils.
						
						
						
						
						
						
					 | 
					
						2013-07-26 15:02:10 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Huang
							
						 
					 | 
					
						
						
						
						
							
						
						
							1caa566280
							
						
					 | 
					
						
						
							
							created a project for db framework
						
						
						
						
						
						
					 | 
					
						2013-07-25 19:00:26 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Huang
							
						 
					 | 
					
						
						
						
						
							
						
						
							9aaa378b08
							
						
					 | 
					
						
						
							
							Moved ClusterManager into it's own package.  Removed the agent load balancing code.
						
						
						
						
						
						
					 | 
					
						2013-07-25 19:00:26 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Prasanna Santhanam
							
						 
					 | 
					
						
						
						
						
							
						
						
							de38cd815f
							
						
					 | 
					
						
						
							
							Fix typo in class name
						
						
						
						
						
						
						
						AsyncRpcConext -> AsyncRpcContext
Signed-off-by: Prasanna Santhanam <tsp@apache.org> 
						
						
					 | 
					
						2013-06-29 13:50:25 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Min Chen
							
						 
					 | 
					
						
						
						
						
							
						
						
							98af424053
							
						
					 | 
					
						
						
							
							Merge branch 'master' into object_store.
						
						
						
						
						
						
					 | 
					
						2013-05-23 18:00:15 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chip Childers
							
						 
					 | 
					
						
						
						
						
							
						
						
							0365d555cf
							
						
					 | 
					
						
						
							
							Adding a name to the framework/jobs/pom.xml file
						
						
						
						
						
						
						
						Signed-off-by: Chip Childers <chip.childers@gmail.com> 
						
						
					 | 
					
						2013-05-20 19:17:33 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nitin Mehta
							
						 
					 | 
					
						
						
						
						
							
						
						
							c11dbad9c9
							
						
					 | 
					
						
						
							
							merge master
						
						
						
						
						
						
					 | 
					
						2013-05-11 15:28:43 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Huang
							
						 
					 | 
					
						
						
						
						
							
						
						
							3047929367
							
						
					 | 
					
						
						
							
							Merged
						
						
						
						
						
						
					 | 
					
						2013-05-10 16:21:43 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Huang
							
						 
					 | 
					
						
						
						
						
							
						
						
							074df0b415
							
						
					 | 
					
						
						
							
							Fixed an incorrect unit test for affinity group.  Removed some useless pom.xml.
						
						
						
						
						
						
					 | 
					
						2013-05-06 16:34:26 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Huang
							
						 
					 | 
					
						
						
						
						
							
						
						
							ad2777c547
							
						
					 | 
					
						
						
							
							Moved agent commands to core and out of api
						
						
						
						
						
						
					 | 
					
						2013-05-06 16:34:20 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Huang
							
						 
					 | 
					
						
						
						
						
							
						
						
							e0d8f01ecd
							
						
					 | 
					
						
						
							
							Removed framework-api which is completely useless.  Changed framework-ipc to reference gson itself.  Move VOs into engine-schema.
						
						
						
						
						
						
					 | 
					
						2013-05-06 16:34:16 -07:00 | 
					
					
						
						
							
							
							
						
					 |