Harikrishna Patnala 
							
						 
					 
					
						
						
						
						
							
						
						
							eae22d2ffa 
							
						 
					 
					
						
						
							
							CLOUDSTACK-741: Granular Global Parameters  
						
						... 
						
						
						
						Signed-off-by: Abhinandan Prateek <aprateek@apache.org> 
						
						
					 
					
						2013-04-19 10:36:52 +05:30 
						 
				 
			
				
					
						
							
							
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							3e4430d811 
							
						 
					 
					
						
						
							
							CLOUDSTACK-658 - Scaleup vm support for Xenserver  
						
						... 
						
						
						
						Added the framweork so that it can be extended for vmware and kvm as well.
Added unitests and marvin tests. 
						
						
					 
					
						2013-03-28 16:43:37 +05:30 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							3ed6200ef8 
							
						 
					 
					
						
						
							
							move default primary storage plugin into its own pom  
						
						
						
						
					 
					
						2013-03-20 17:21:40 -07:00 
						 
				 
			
				
					
						
							
							
								Deepti Dohare 
							
						 
					 
					
						
						
						
						
							
						
						
							d5cb32f159 
							
						 
					 
					
						
						
							
							Multiple Secondary Storage Issue  
						
						
						
						
					 
					
						2013-03-14 21:08:27 -04:00 
						 
				 
			
				
					
						
							
							
								Kishan Kavala 
							
						 
					 
					
						
						
						
						
							
						
						
							2dd31f331d 
							
						 
					 
					
						
						
							
							CLOUDSTACK-1636: Removed the concept of owner region.  
						
						... 
						
						
						
						Removed region_id from user/account and domain tables.
Removed forwarding of api calls to owner region.
Removed api_key and secret_key from region table.
Included related DB upgrade changes. 
						
						
					 
					
						2013-03-14 11:53:40 +05:30 
						 
				 
			
				
					
						
							
							
								Jayapal Uradi 
							
						 
					 
					
						
						
						
						
							
						
						
							aedb8c478e 
							
						 
					 
					
						
						
							
							CLOUDSTACK-24: mipn feature for isolated and vpc networks  
						
						... 
						
						
						
						https://cwiki.apache.org/confluence/display/CLOUDSTACK/Multiple+IP+address+per+NIC 
 https://issues.apache.org/jira/browse/CLOUDSTACK-24  
					
						2013-03-04 11:02:09 +05:30 
						 
				 
			
				
					
						
							
							
								Abhinandan Prateek 
							
						 
					 
					
						
						
						
						
							
						
						
							14791a9d8f 
							
						 
					 
					
						
						
							
							Revert "CLOUDSTACK-24: multiple ip address per vm nic changes for isolated and vpc networks changes."  
						
						... 
						
						
						
						This reverts commit f9d96c9169a50917143914ffb53e227c8673c50f. 
						
						
					 
					
						2013-03-01 22:29:47 +05:30 
						 
				 
			
				
					
						
							
							
								Jayapal Uradi 
							
						 
					 
					
						
						
						
						
							
						
						
							f9d96c9169 
							
						 
					 
					
						
						
							
							CLOUDSTACK-24: multiple ip address per vm nic changes for isolated and vpc networks changes.  
						
						
						
						
					 
					
						2013-03-01 16:40:26 +05:30 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							a22403edcd 
							
						 
					 
					
						
						
							
							squash changes into one giant patch  
						
						
						
						
					 
					
						2013-02-21 11:22:48 -08:00 
						 
				 
			
				
					
						
							
							
								Kishan Kavala 
							
						 
					 
					
						
						
						
						
							
						
						
							7d61ee6e99 
							
						 
					 
					
						
						
							
							CLOUDSTACK-1295 : Added usage unit tests  
						
						... 
						
						
						
						Fixed Component annontation for usage parsers
Fixed mvn target to run usage
removed UsageServerComponentConfig which is not required
Added region_id to account table in cloud_usage db
Conflicts:
	setup/db/db/schema-40to410.sql 
						
						
					 
					
						2013-02-15 18:41:28 +05:30 
						 
				 
			
				
					
						
							
							
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							7b75f0d990 
							
						 
					 
					
						
						
							
							Sync master to javelin one more time  
						
						
						
						
					 
					
						2013-02-01 11:37:33 -08:00 
						 
				 
			
				
					
						
							
							
								Kishan Kavala 
							
						 
					 
					
						
						
						
						
							
						
						
							e7341313e9 
							
						 
					 
					
						
						
							
							Added unit tests  
						
						
						
						
					 
					
						2013-01-31 22:28:09 +05:30 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							fe6f0457d5 
							
						 
					 
					
						
						
							
							fixed unit tests from merge  
						
						
						
						
					 
					
						2013-01-18 15:58:55 -08:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							10d9c019a9 
							
						 
					 
					
						
						
							
							All merge conflicts resolved  
						
						
						
						
					 
					
						2013-01-18 12:14:57 -08:00 
						 
				 
			
				
					
						
							
							
								Marcus Sorensen 
							
						 
					 
					
						
						
						
						
							
						
						
							975021dda1 
							
						 
					 
					
						
						
							
							Summary: adding resizeVolume api call  
						
						... 
						
						
						
						Detail: This merges the resizevolume feature branch, which provides the
ability to migrate a disk between disk offerings, thereby changing its
size, or specifying a new size if current disk offering is custom.
BUG-ID: CLOUDSTACK-644
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1358358209 -0700 
						
						
					 
					
						2013-01-16 17:43:35 -07:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							e54ed85926 
							
						 
					 
					
						
						
							
							getting it to compile  
						
						
						
						
					 
					
						2013-01-08 14:39:05 -08:00 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							c5abc180ab 
							
						 
					 
					
						
						
							
							CLOUDSTACK-212: Move api/test pkg to org.apache.cloudstack  
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2013-01-05 15:53:59 -08:00 
						 
				 
			
				
					
						
							
							
								Prasanna Santhanam 
							
						 
					 
					
						
						
						
						
							
						
						
							840da55520 
							
						 
					 
					
						
						
							
							api: Entities will extend InternalIdentity and Identity  
						
						... 
						
						
						
						Entities correlated to the Identity and carry a uuid and those
correlated to InternalIdentity carry an id. Those entities that carry
both will correlated to Identity and InternalIdentity.
This refactors entities wherever possible to ensure the VO only
implements the first class entity.
Signed-off-by: Prasanna Santhanam <tsp@apache.org> 
						
						
					 
					
						2012-12-26 19:11:15 -08:00 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							296b49c2f8 
							
						 
					 
					
						
						
							
							Merge branch 'master' into test-merge-api  
						
						... 
						
						
						
						Conflicts:
	api/src/com/cloud/agent/api/BackupSnapshotCommand.java
	api/src/com/cloud/agent/api/storage/PrimaryStorageDownloadCommand.java
	api/src/com/cloud/agent/api/to/PortForwardingRuleTO.java
	api/src/com/cloud/network/NetworkService.java
	api/src/com/cloud/resource/ResourceService.java
	api/src/org/apache/cloudstack/api/ApiConstants.java
	api/src/org/apache/cloudstack/api/ResponseGenerator.java
	api/src/org/apache/cloudstack/api/response/SSHKeyPairResponse.java
	client/tomcatconf/commands.properties.in
	core/src/com/cloud/storage/SnapshotVO.java
	pom.xml
	server/src/com/cloud/api/ApiDispatcher.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java
	server/src/com/cloud/offerings/NetworkOfferingVO.java
	server/src/com/cloud/resource/ResourceManagerImpl.java
	server/src/com/cloud/upgrade/dao/Upgrade40to41.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/test/com/cloud/vpc/MockNetworkManagerImpl.java
	setup/db/create-schema.sql
	setup/db/db/schema-40to410.sql
Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2012-12-23 13:54:46 -08:00 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							2140ff55ea 
							
						 
					 
					
						
						
							
							api: Refactor and move VPN related api cmd classes to command.user.vpn  
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2012-12-22 16:13:37 -08:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							348d3ae448 
							
						 
					 
					
						
						
							
							Conflicts:  
						
						... 
						
						
						
						api/src/org/apache/cloudstack/api/response/AccountResponse.java
Signed-off-by: Min Chen <min.chen@citrix.com> 
						
						
					 
					
						2012-12-17 15:41:56 -08:00 
						 
				 
			
				
					
						
							
							
								Marcus Sorensen 
							
						 
					 
					
						
						
						
						
							
						
						
							6ed1989133 
							
						 
					 
					
						
						
							
							Summary: Allow for custom storage adaptors based on pool type in KVM  
						
						... 
						
						
						
						Detail: Instead of using LibvirtStorageAdaptor for everything, you can create
your own storage adaptor and use it. We select storage adaptor based on storage
pool type, thus we needed to adjust LibvirtComputingResource to pass pool type
to everything in KVMStoragePoolManager. This in turn required that we pass the
info necessary to LibvirtComputingResource as well, so a few agent Commands were
modified.
Note this patch in and of itself shouldn't change any existing behavior, just
allow for new storage adaptors to be selected based on storage pool type.
Reviewed-by: Edison Su
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1355769696 -0700 
						
						
					 
					
						2012-12-17 11:41:36 -07:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							c167ad45e3 
							
						 
					 
					
						
						
							
							Move view based VO and Dao classes to cloud-server module to hide the  
						
						... 
						
						
						
						details from API client, also extract query related methods into
QueryService interface. 
						
						
					 
					
						2012-12-14 10:47:58 -08:00 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							e398b1e47a 
							
						 
					 
					
						
						
							
							api: Refactor command and response classes to org.apache.cloudstack.api.*  
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2012-12-07 19:23:24 -08:00 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							af28c06998 
							
						 
					 
					
						
						
							
							api: move and group all under command, org.apache.cloudstack.command.*  
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2012-12-07 18:30:54 -08:00 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							da6e81aa21 
							
						 
					 
					
						
						
							
							api_refactoring: Fix build issues and incorrect imports  
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2012-12-06 13:48:20 -08:00 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							780eb95830 
							
						 
					 
					
						
						
							
							api_refactor: swift, ldap and vlan apis to admin pkg  
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2012-12-06 11:13:46 -08:00 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							28305904e8 
							
						 
					 
					
						
						
							
							api_refactor: move cluster apis to admin package  
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2012-12-06 11:04:24 -08:00 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							2a7fa674c7 
							
						 
					 
					
						
						
							
							api_refactor: Move host apis to admin pkg  
						
						... 
						
						
						
						- Moved host related apis to admin pkg
- Change namespace to org.a.cs.api, fix mappings in commands-prop.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2012-12-06 10:21:10 -08:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							b0ce8fd4ff 
							
						 
					 
					
						
						
							
							api: Optimize and improve api, db call perfomance  
						
						... 
						
						
						
						This is part 1 of list API refactoring. Commands covered:
listVmsCmd, listRoutersCmd Response covered:
UserVmResponse, DomainRouterResponse. DB views created:
user_vm_view, domain_router_view.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2012-12-05 20:06:20 -08:00 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							55364478e5 
							
						 
					 
					
						
						
							
							api_refactor: move vpn related apis to user.vpn  
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2012-12-05 14:24:26 -08:00 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							2121fbd469 
							
						 
					 
					
						
						
							
							api_refactor: refactor network apis for admin pkg  
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2012-12-04 11:38:40 -08:00 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							1b8dc65f3a 
							
						 
					 
					
						
						
							
							api_refactor: refactor user (vpn) apis  
						
						... 
						
						
						
						- Fix refactored apis, mappings in commands*.in
Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2012-12-04 10:27:47 -08:00 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							9a0df30766 
							
						 
					 
					
						
						
							
							api_refactor: refactor account apis  
						
						... 
						
						
						
						- Fix refactored apis, fix mappings in commands*.in
- Fix comments etc.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2012-12-03 23:42:13 -08:00 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							5e0501d116 
							
						 
					 
					
						
						
							
							api_refactor: refactor project apis  
						
						... 
						
						
						
						- Fix refactored apis in commands*.in
- Fix comments etc.
- Expand tabs, remove trailing whitespace
- Fix trailing whitespaces for all *.java
Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2012-12-03 22:10:32 -08:00 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							6fc3bc3760 
							
						 
					 
					
						
						
							
							api_refactor: refactor vpn and vm apis  
						
						... 
						
						
						
						- Refactor VPN and VM APIs to admin and user pkgs
- Names space, org.apache.cloudstack
- Fix refactored apis in commands*.in
- Fix comments etc.
- Expand tabs, remove trailing whitespace
Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2012-12-03 21:27:02 -08:00 
						 
				 
			
				
					
						
							
							
								Chip Childers 
							
						 
					 
					
						
						
						
						
							
						
						
							b1c063298d 
							
						 
					 
					
						
						
							
							Reworked the formatting and structure of the api project's unit tests.  
						
						... 
						
						
						
						Signed-off-by: Chip Childers <chip.childers@gmail.com> 
						
						
					 
					
						2012-11-21 09:56:22 -05:00 
						 
				 
			
				
					
						
							
							
								Chip Childers 
							
						 
					 
					
						
						
						
						
							
						
						
							e953b77492 
							
						 
					 
					
						
						
							
							Moving api tests into a similar package structure as other tests  
						
						... 
						
						
						
						Signed-off-by: Chip Childers <chip.childers@gmail.com> 
						
						
					 
					
						2012-11-21 09:17:47 -05:00 
						 
				 
			
				
					
						
							
							
								Yichi Lu 
							
						 
					 
					
						
						
						
						
							
						
						
							6d200c5021 
							
						 
					 
					
						
						
							
							Adding a bunch of agent/api command tests  
						
						... 
						
						
						
						Signed-off-by: Chip Childers <chip.childers@gmail.com> 
						
						
					 
					
						2012-11-20 12:41:42 -05:00 
						 
				 
			
				
					
						
							
							
								Meghna Kale 
							
						 
					 
					
						
						
						
						
							
						
						
							b1af510715 
							
						 
					 
					
						
						
							
							Adding new unit tests for a set of API commands  
						
						... 
						
						
						
						Signed-off-by: Chip Childers <chip.childers@gmail.com> 
						
						
					 
					
						2012-11-20 12:28:55 -05:00 
						 
				 
			
				
					
						
							
							
								Meghna Kale 
							
						 
					 
					
						
						
						
						
							
						
						
							b7c74ee78b 
							
						 
					 
					
						
						
							
							Unit test additions (and some minor command class changes to support testing)  
						
						... 
						
						
						
						Signed-off-by: Chip Childers <chip.childers@gmail.com> 
						
						
					 
					
						2012-11-20 12:21:54 -05:00