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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							db65dfbb12 
							
						 
					 
					
						
						
							
							Work around an issue in using IPC callback for  
						
						 
						
						... 
						
						
						
						HypervisorTemplateAdapter. 
						
						
					 
					
						2013-05-06 15:10:31 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							d44e25efba 
							
						 
					 
					
						
						
							
							add unit test to message bus in master branch  
						
						 
						
						
						
						
					 
					
						2013-04-29 14:36:03 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							85e73d18f5 
							
						 
					 
					
						
						
							
							Refactor message bus facitlity to avoid confusing with event bus for external notification, planning to use it in VMSync  
						
						 
						
						
						
						
					 
					
						2013-04-29 14:36:03 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Spindler 
							
						 
					 
					
						
						
						
						
							
						
						
							469c4dd139 
							
						 
					 
					
						
						
							
							Removing ^M's from code.  
						
						 
						
						... 
						
						
						
						Signed-off-by: Prasanna Santhanam <tsp@apache.org> 
						
						
					 
					
						2013-04-04 00:53:20 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							c8fd16c03d 
							
						 
					 
					
						
						
							
							Summary: Workaround for CLOUDSTACK-1831 and CLOUDSTACK-1672  
						
						 
						
						... 
						
						
						
						Exclude the transient dependency on jaxb-impl 2.1.13 in cxf-bundle-jars.
VmWare code depends on the 2.0 version 
						
						
					 
					
						2013-03-28 15:00:04 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Noa Resare 
							
						 
					 
					
						
						
						
						
							
						
						
							2f135be15f 
							
						 
					 
					
						
						
							
							CLOUDSTACK-1415: Debian & Ubuntu packaging work  
						
						 
						
						... 
						
						
						
						Some concepts included:
* the replace.properties location used by maven is parameterized to allow
  for a build that does not modify the currently git tracked files
* package naming is updated along the lines of what was discussed on the
  -dev mailing list and between committers at the Build a Cloud Day in Belgi
* package version pattern is updated (since we redo all package names,
  we might as well drop the epoch) 
						
						
					 
					
						2013-02-27 15:44:46 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Murali Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							3e0bdaac1e 
							
						 
					 
					
						
						
							
							CLOUDSTACK-1391: EventBus is not getting injected after javelin merge  
						
						 
						
						... 
						
						
						
						added logic to inject event bus using ComponentContext.getComponent
Conflicts:
	server/src/com/cloud/storage/listener/SnapshotStateListener.java 
						
						
					 
					
						2013-02-27 18:55:22 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							8eca74134a 
							
						 
					 
					
						
						
							
							rebase to master  
						
						 
						
						
						
						
					 
					
						2013-02-21 11:22:50 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							a22403edcd 
							
						 
					 
					
						
						
							
							squash changes into one giant patch  
						
						 
						
						
						
						
					 
					
						2013-02-21 11:22:48 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							80d58b6c73 
							
						 
					 
					
						
						
							
							CLOUDSTACK-1317: Bump CloudStack package version to 4.2.0-SNAPSHOT in all poms  
						
						 
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2013-02-20 16:42:56 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							9755d9b4a2 
							
						 
					 
					
						
						
							
							Keep naming more or less consistent  
						
						 
						
						
						
						
					 
					
						2013-02-02 12:43:15 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							7b75f0d990 
							
						 
					 
					
						
						
							
							Sync master to javelin one more time  
						
						 
						
						
						
						
					 
					
						2013-02-01 11:37:33 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Murali Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							1a348c85fd 
							
						 
					 
					
						
						
							
							adding apache license heders to the files that are faling RAT check  
						
						 
						
						
						
						
					 
					
						2013-02-01 11:41:30 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Murali Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							e7a554fc6a 
							
						 
					 
					
						
						
							
							Merging events framework branch into master. This commit will bring  
						
						 
						
						... 
						
						
						
						following changes
   - introduced notion of event bus with publish, subscribe, unsubscribe
     semantics
   - a plug-in can implement the EventBus abstraction to provide event
     bug to CloudStack
   - A rabbitMQ based plug-in that can interact with AMQP servers to
     provide message broker based event-bug
   - stream lines, action events, usage events, alerts publishing in to
     convineance classed which are also used to publish corresponding
     event on to event bus
   - introduced notion of state change event. On a state change, in the
     state machine corrsponding to the resource, a state change event is
     published on the event bug
   - associated a state machined with Snapshot and Network objects
   - Virtual Machine, Volume, Snaphost, Network object state changes wil
     result in a state change event 
						
						
					 
					
						2013-02-01 01:37:24 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							9759ad57f2 
							
						 
					 
					
						
						
							
							Commit the current changes to unit tests  
						
						 
						
						
						
						
					 
					
						2013-01-17 06:50:11 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							ea3f5ecb54 
							
						 
					 
					
						
						
							
							Fix license for xml files in javelin  
						
						 
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2013-01-12 06:31:47 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							ba20e7f85a 
							
						 
					 
					
						
						
							
							Fix license headers for java files in javelin  
						
						 
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2013-01-12 06:27:09 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							cf8de7ee17 
							
						 
					 
					
						
						
							
							Removed all the .project files  
						
						 
						
						
						
						
					 
					
						2013-01-08 14:11:00 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							2d6133c61e 
							
						 
					 
					
						
						
							
							change the top level async call using future  
						
						 
						
						
						
						
					 
					
						2013-01-04 17:17:57 -08:00