Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							1a6df6f978 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7908: Add user_id column to vm_instance table  
						
						... 
						
						
						
						Design Document:
https://cwiki.apache.org/confluence/display/CLOUDSTACK/Allow+VM+listing+by+User+ID 
- Adds column to VMInstance DAO
- Adds column in vm_instance table
- Adds column in the UserVMJoinVO
- Adds default admin user which has UID = 2
- Adds migration path that sets user_id to first user of the accountId that
  owns the vm in vm_instance table
- Add arg on list VMs API to query by userId, add support in query layer
- Refactor VMInstanceVO and child classes to accept userId
- Add code to let service layer pass userId if loggedIn user belongs to same
  account as the owner executing an API call or use first user from owner account
- In case of CPVM and SSVM use system user ID
- Fix unit tests and spring injections
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> 
						
						
					 
					
						2015-02-16 15:02:38 +05:30 
						 
				 
			
				
					
						
							
							
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							4ebaf0a583 
							
						 
					 
					
						
						
							
							Bump master version to 4.6.0-SNAPSHOT after branching 4.5.0-SNAPSHOT  
						
						
						
						
					 
					
						2014-10-29 14:54:23 +01:00 
						 
				 
			
				
					
						
							
							
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							dc3f0cbc63 
							
						 
					 
					
						
						
							
							Improve the handling of the findbug exclude files  
						
						
						
						
					 
					
						2014-09-03 10:41:22 +02:00 
						 
				 
			
				
					
						
							
							
								Marcus Sorensen 
							
						 
					 
					
						
						
						
						
							
						
						
							11f5bdd78d 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6191 Add support for specifying volume provisioning  
						
						... 
						
						
						
						type (thin, sparse, fat) in disk/compute offerings.
Submitted-by: Yoshikazu Nojima <mail@ynojima.net>
Reviewed-by: Marcus Sorensen, Mike Tutowski 
						
						
					 
					
						2014-04-10 09:23:04 -06:00 
						 
				 
			
				
					
						
							
							
								Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							8b62b2cb92 
							
						 
					 
					
						
						
							
							findbugs: exclude known spiffy hacks a.k.a. false positives  
						
						
						
						
					 
					
						2014-03-28 14:28:10 +01:00 
						 
				 
			
				
					
						
							
							
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							4402685e11 
							
						 
					 
					
						
						
							
							Update master to 4.5.0-SNAPSHOT  
						
						
						
						
					 
					
						2014-03-14 14:55:26 +01:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							5a8d165afa 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6198: use List DS for storing NicProfiles as public network can have more than one nic  
						
						... 
						
						
						
						Conflicts:
	engine/api/src/com/cloud/vm/VirtualMachineManager.java
	engine/api/src/org/apache/cloudstack/engine/orchestration/service/NetworkOrchestrationService.java
	engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
	engine/orchestration/src/org/apache/cloudstack/engine/orchestration/CloudOrchestrator.java
	engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
	plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java
	plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/lb/InternalLoadBalancerVMManagerImpl.java
	plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ServiceManagerImpl.java
	server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
	server/test/com/cloud/vpc/MockNetworkManagerImpl.java
	services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java 
						
						
					 
					
						2014-03-04 15:37:52 -08:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							0f489732c8 
							
						 
					 
					
						
						
							
							Display flag support for LB/InternalLB/NetworkACL rules  
						
						
						
						
					 
					
						2014-02-21 14:03:10 -08:00 
						 
				 
			
				
					
						
							
							
								Miguel Ferreira 
							
						 
					 
					
						
						
						
						
							
						
						
							8649fa005a 
							
						 
					 
					
						
						
							
							Fix findbugs findings in cloud-plugin-network-elb  
						
						... 
						
						
						
						Findings:
    - comparing Longs by reference
    - possible null pointer dereference
Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com> 
						
						
					 
					
						2014-02-14 18:37:46 +01:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							452c20b242 
							
						 
					 
					
						
						
							
							Configuration: define "host" global config parameter in cloud-api package instead of ClusterManager as the parameter is mostly used by sevices components running remotely (consoleProxy, secondarystorage), or by third party integrators.  
						
						... 
						
						
						
						Also intoroduced one more global config parameter - api.servlet.endpoint (default value is "http://localhost:8080/client/api ?"). The parameter defines API end point. Can be used by CS components/services deployed remotely, for sending CS API requests 
						
						
					 
					
						2014-01-20 13:37:52 -08:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							be5e5cc641 
							
						 
					 
					
						
						
							
							All Checkstyle problems corrected  
						
						
						
						
					 
					
						2013-12-12 12:26:07 -08:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							433a631916 
							
						 
					 
					
						
						
							
							Reformat of source code to set a stable base for the future.  I couldn't get checkstyle enabled.  There's still about a thousand errors from checkstyle.  Most of it from length errors from comments and strings.  Will attempt to remove those tonight.  This change is so large I just want to get it in before any merge nightmares.  The changes are fairly minor though and I did a full compile and start a server with the reformat code.  
						
						
						
						
					 
					
						2013-11-21 07:56:47 -08:00 
						 
				 
			
				
					
						
							
							
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							cf715ff491 
							
						 
					 
					
						
						
							
							Bump 4.3.0 to 4.4.0 in master  
						
						
						
						
					 
					
						2013-11-21 16:01:15 +01:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							d620df2bdd 
							
						 
					 
					
						
						
							
							Reformatted all of the code.  
						
						
						
						
					 
					
						2013-11-21 06:15:26 -08:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							8d62744681 
							
						 
					 
					
						
						
							
							Reformat all source code.  Added checkstyle to check the source code  
						
						
						
						
					 
					
						2013-11-20 07:26:53 -08:00 
						 
				 
			
				
					
						
							
							
								Syed 
							
						 
					 
					
						
						
						
						
							
						
						
							0076307863 
							
						 
					 
					
						
						
							
							Squashed merge of Ssl Termination feature  
						
						... 
						
						
						
						Bug: https://issues.apache.org/jira/browse/CLOUDSTACK-4821 
FS: https://cwiki.apache.org/confluence/display/CLOUDSTACK/SSL+Termination+Support 
This patch implements the SSL offload feature for loadbalancers
and includes the implementaion for this to work with Netscaler.
The following are the new API's that this patch adds
uploadSslCert
deleteSslCert
listSslCert
assignCertToLoadBalancer
removeCertFromLoadBalancer
Unit tests are also included in the patch. 
						
						
					 
					
						2013-11-08 16:49:16 +05:30 
						 
				 
			
				
					
						
							
							
								Darren Shepherd 
							
						 
					 
					
						
						
						
						
							
						
						
							891b85d516 
							
						 
					 
					
						
						
							
							Add missing licenses  
						
						
						
						
					 
					
						2013-10-23 15:20:08 -07:00 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								Darren Shepherd 
							
						 
					 
					
						
						
						
						
							
						
						
							205a77a5bb 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/txn-refactor'  
						
						... 
						
						
						
						Conflicts:
	engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
	server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java 
						
						
					 
					
						2013-10-23 10:40:44 -07:00 
						 
				 
			
				
					
						
							
							
								Darren Shepherd 
							
						 
					 
					
						
						
						
						
							
						
						
							edeaf98117 
							
						 
					 
					
						
						
							
							Cleaner and more type safe Transaction API for checked exceptions  
						
						
						
						
					 
					
						2013-10-23 10:02:43 -07:00 
						 
				 
			
				
					
						
							
							
								dhoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							c0c46268ac 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4328 httpclose/mode as keepAliveEnabled  
						
						
						
						
					 
					
						2013-10-22 12:44:23 +02:00 
						 
				 
			
				
					
						
							
							
								Darren Shepherd 
							
						 
					 
					
						
						
						
						
							
						
						
							f62e28c1ec 
							
						 
					 
					
						
						
							
							New Transaction API  
						
						... 
						
						
						
						Introduction of a new Transaction API that is more consistent with the style
of Spring's transaction managment.  The existing Transaction class was renamed
to TransactionLegacy.  All of the non-DAO code in the management server has been
updated to use the new Transaction API. 
						
						
					 
					
						2013-10-16 09:21:00 -07: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 
							
						 
					 
					
						
						
						
						
							
						
						
							a05ec6df33 
							
						 
					 
					
						
						
							
							Fixed up the agent separation.  Added comments for config packaging.  
						
						
						
						
					 
					
						2013-09-06 15:40:39 -07:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							8e5249df62 
							
						 
					 
					
						
						
							
							Moved NetworkManager to NetworkOrchestrationService  
						
						
						
						
					 
					
						2013-09-06 15:40:31 -07:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							494ea5052f 
							
						 
					 
					
						
						
							
							Made IpAddressManager a manager  
						
						
						
						
					 
					
						2013-08-19 14:13:31 -07:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							092e20204a 
							
						 
					 
					
						
						
							
							Divided NetworkManagerImpl into two files: NetworkManagerImpl and IpAddressManagerImpl  
						
						
						
						
					 
					
						2013-08-19 14:13:29 -07:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							4ba359c3fe 
							
						 
					 
					
						
						
							
							Moved VirtualMachineManager into engine  
						
						
						
						
					 
					
						2013-08-19 14:13:28 -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 
							
						 
					 
					
						
						
						
						
							
						
						
							9bc5870f01 
							
						 
					 
					
						
						
							
							Removed the remove method.  Not sure why we added to VirtualMachineManager  
						
						
						
						
					 
					
						2013-07-23 18:24:58 -07:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							5297a071d2 
							
						 
					 
					
						
						
							
							Changed virtual machine stop to use uuid  
						
						
						
						
					 
					
						2013-07-22 20:06:04 -07:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							6ac361e6a2 
							
						 
					 
					
						
						
							
							Removed VM generic from VirtualMachineGuru.  Part of the cleanup to make vmsync a simple vm manager that doesn't understand the different types of vms  
						
						
						
						
					 
					
						2013-07-22 16:32:59 -07:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							1325014a03 
							
						 
					 
					
						
						
							
							Changed VirtualMachineProfile to be non-generic.  From here on VirtualMachineManager will only manage vm instance.  It doesn't understand the difference between different types of VMs.  This makes the vmsync code to be generic across all vms.  
						
						
						
						
					 
					
						2013-07-22 11:48:11 -07:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							7928963d16 
							
						 
					 
					
						
						
							
							Changed start to use uuid instead of generic vm start  
						
						
						
						
					 
					
						2013-07-22 11:46:33 -07:00 
						 
				 
			
				
					
						
							
							
								ahuang 
							
						 
					 
					
						
						
						
						
							
						
						
							541f9d7f9c 
							
						 
					 
					
						
						
							
							Changed allocate method to be virtual machine type agnostic  
						
						
						
						
					 
					
						2013-07-17 15:58:46 -07:00 
						 
				 
			
				
					
						
							
							
								Bharat Kumar 
							
						 
					 
					
						
						
						
						
							
						
						
							dd33abffbe 
							
						 
					 
					
						
						
							
							Cloudstack-2997 Make haproxy maxconn configurable  
						
						... 
						
						
						
						Signed-off-by: Abhinandan Prateek <aprateek@apache.org> 
						
						
					 
					
						2013-07-17 10:06:11 +05:30 
						 
				 
			
				
					
						
							
							
								ahuang 
							
						 
					 
					
						
						
						
						
							
						
						
							11e1e585b1 
							
						 
					 
					
						
						
							
							UserContext switched to CallContext.  Added generic storage mechanism for other code to carry information throughout a call.  Made the calling User and Account a must have.  Added an interface to carry entities in error.  Fixed up the code.  Part of the vmsync branch  
						
						
						
						
					 
					
						2013-07-16 11:24:21 -07:00 
						 
				 
			
				
					
						
							
							
								ahuang 
							
						 
					 
					
						
						
						
						
							
						
						
							17984a3f8c 
							
						 
					 
					
						
						
							
							Removed the plug and unplug method from VMGuru.  Why should VMGuru understand how to plug and unplug nics?  Part of componentizing the vmsync work  
						
						
						
						
					 
					
						2013-07-15 11:00:58 -07:00 
						 
				 
			
				
					
						
							
							
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							c11dbad9c9 
							
						 
					 
					
						
						
							
							merge master  
						
						
						
						
					 
					
						2013-05-11 15:28:43 +05:30 
						 
				 
			
				
					
						
							
							
								Rajesh Battala 
							
						 
					 
					
						
						
						
						
							
						
						
							183b989d30 
							
						 
					 
					
						
						
							
							CLOUDSTACK-664:AWS-Health Check feature: Patch applied cleanly , RAT build is successful  
						
						
						
						
					 
					
						2013-03-18 14:01:15 +05:30 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							176523254e 
							
						 
					 
					
						
						
							
							Improve component lifecycle management with system run-level concept  
						
						
						
						
					 
					
						2013-01-30 15:21:02 -08:00 
						 
				 
			
				
					
						
							
							
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							aa7b3e0f6d 
							
						 
					 
					
						
						
							
							Renaming VmInstanceVO: dataCenterIdToDeployIn to dataCenterId  
						
						... 
						
						
						
						Corresponding getter/setter is renamed too.
Reason is GenericDao does not update the field unless the method name matches the field name; the setter of this VO was one such case. 
						
						
					 
					
						2013-01-22 12:56:39 -08:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							4fbecf15ec 
							
						 
					 
					
						
						
							
							add unit test back, primary storage life cycle is tested  
						
						
						
						
					 
					
						2013-01-21 17:01:00 -08:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							10d9c019a9 
							
						 
					 
					
						
						
							
							All merge conflicts resolved  
						
						
						
						
					 
					
						2013-01-18 12:14:57 -08:00