Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							214bbf3ebd 
							
						 
					 
					
						
						
							
							CLOUDSTACK-279: fixed deleteProject when executed by the regular user. Always pass System account as a caller when do account cleanup  
						
						... 
						
						
						
						Conflicts:
	api/src/com/cloud/api/commands/DeleteRemoteAccessVpnCmd.java
	server/src/com/cloud/network/element/CiscoNexusVSMElement.java
	server/src/com/cloud/network/element/ElasticLoadBalancerElement.java
	server/src/com/cloud/network/element/F5ExternalLoadBalancerElement.java
	server/src/com/cloud/network/element/JuniperSRXExternalFirewallElement.java
	server/src/com/cloud/network/element/NetscalerElement.java
	server/src/com/cloud/network/element/OvsElement.java
	server/src/com/cloud/network/element/VpcJuniperSRXExternalFirewallElement.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/vpc/VpcManagerImpl.java
	server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
	server/src/com/cloud/storage/StorageManager.java 
						
						
					 
					
						2012-10-17 17:26:19 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							3f5733cea7 
							
						 
					 
					
						
						
							
							CS-16412: fixed count for following commands:  
						
						... 
						
						
						
						listVlanIpRanges
listOsCategories
listOsTypes
listSystemVms
listPhysicalNetworks
listCounters
listConditions
listAutoScalePolicies
listAutoScaleVmProfiles
listAutoScaleVmGroups
listConfigurations
listStoragePools
listClusters
listPods
listInstanceGroups
listSSHKeyPairs
listHypervisorCapabilities
listNetworkServiceProviders
listVpnCustomerGateways
listVpnGateways
listVpnConnections
listProjects
listProjectAccounts
listProjectInvitations
listTrafficTypes
Conflicts:
	api/src/com/cloud/api/commands/ListAutoScalePoliciesCmd.java
	api/src/com/cloud/api/commands/ListAutoScaleVmGroupsCmd.java
	api/src/com/cloud/api/commands/ListAutoScaleVmProfilesCmd.java
	api/src/com/cloud/api/commands/ListConditionsCmd.java
	api/src/com/cloud/api/commands/ListCountersCmd.java
	api/src/com/cloud/api/commands/ListVpnConnectionsCmd.java
	api/src/com/cloud/api/commands/ListVpnCustomerGatewaysCmd.java
	api/src/com/cloud/api/commands/ListVpnGatewaysCmd.java
	api/src/com/cloud/network/as/AutoScaleService.java
	server/src/com/cloud/network/as/AutoScaleManagerImpl.java
	server/src/com/cloud/network/as/dao/CounterDao.java
	server/src/com/cloud/network/as/dao/CounterDaoImpl.java
	server/src/com/cloud/projects/ProjectManagerImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java 
						
						
					 
					
						2012-10-15 18:16:59 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							1d458c7a2d 
							
						 
					 
					
						
						
							
							CLOUDSTACK-347: ipAddressResponse/NetworkResponse API - return vlan info only when the caller is ROOT admin  
						
						
						
						
					 
					
						2012-10-15 11:39:38 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							8f2d9a09e5 
							
						 
					 
					
						
						
							
							CLOUDSTACK-332: intermediate checkin fixing count parameter in listCommands  
						
						... 
						
						
						
						Fixes the count in commands:
listVolumes
listVirtualMachines
listSnapshots
listRouters
listFirewallRules
listPortForwardingRules
listLoadBalancerRules
listIpForwardingRules
listAccounts
listUsers
listDomains
listDomainChildren
listPublicIpAddresses
listAlerts
listAsyncJobs
listRemoteAccessVpns
listVpnUsers
listTags
listPrivateGateways
listNetworkACLs
listStaticRoutes
Conflicts:
	api/src/com/cloud/api/commands/ListVMsCmd.java
	api/src/com/cloud/api/commands/ListVolumesCmd.java
	api/src/com/cloud/network/lb/LoadBalancingRulesService.java
	server/src/com/cloud/network/firewall/FirewallManagerImpl.java
	server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java
	server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java
	server/src/com/cloud/network/vpc/VpcManagerImpl.java
	server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
	server/src/com/cloud/tags/TaggedResourceManagerImpl.java 
						
						
					 
					
						2012-10-12 13:58:59 -07:00 
						 
				 
			
				
					
						
							
							
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							c07d6d28ee 
							
						 
					 
					
						
						
							
							Merge branch 'nicira-l3support'  
						
						... 
						
						
						
						This commit merges the nicira-l3support branch with master. This
effectively adds nicira nvp l3 support to master. The NiciraNVP Provider
can support the following services with this modification: Connectivity,
SourceNat, StaticNat and PortForwarding
Testing done:
Create, Delete network offerings with Nicira Element
Use Gui to add, modify, remove Nicira Element and Provider
Provision, deprovision SourceNat networks
Provision, deprovision Portforwarding and StaticNat rules
Tested with Nicira NVP release 2.1.0, 2.2.0 and 2.2.1 (2.2.x recommended) 
						
						
					 
					
						2012-10-12 14:15:17 +02:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							339aa41442 
							
						 
					 
					
						
						
							
							CLOUDSTACK-304: Synchronization support for createSnapshot command - don't sent more than "concurrent.snapshots.threshold.perhost" createSnapshots commands to the backend host.  
						
						... 
						
						
						
						Conflicts:
	core/src/com/cloud/async/AsyncJobVO.java
	core/src/com/cloud/async/SyncQueueVO.java
	server/src/com/cloud/api/ApiDispatcher.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/async/AsyncJobManagerImpl.java
	server/src/com/cloud/async/SyncQueueManager.java
	server/src/com/cloud/async/SyncQueueManagerImpl.java
	server/src/com/cloud/async/dao/SyncQueueDao.java
	server/src/com/cloud/storage/snapshot/SnapshotSchedulerImpl.java
	server/test/com/cloud/async/TestSyncQueueManager.java
	setup/db/create-schema.sql 
						
						
					 
					
						2012-10-10 13:40:00 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							43b406279a 
							
						 
					 
					
						
						
							
							listTemplates/listIsos - template filter "all" can be specified by admin only. Throw an error when user tries to use it  
						
						
						
						
					 
					
						2012-10-09 16:23:05 -07:00 
						 
				 
			
				
					
						
							
							
								Mice Xia 
							
						 
					 
					
						
						
						
						
							
						
						
							a5bca0999a 
							
						 
					 
					
						
						
							
							CLOUDSTACK-118 Status of host resorce stuck in ErrorInMaintenance  
						
						
						
						
					 
					
						2012-10-08 14:05:05 +08:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							be2017849a 
							
						 
					 
					
						
						
							
							CLOUDSTACK-84: fixed NPE that used to happen on API layer when list resource of the project was called when project was going through removal process.  
						
						
						
						
					 
					
						2012-10-05 15:10:31 -07:00 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							5cd7fb8408 
							
						 
					 
					
						
						
							
							CLOUDSTACK-121: Fixed "Incorrect username/domainId login causes NullPointerException "  
						
						
						
						
					 
					
						2012-10-05 11:42:04 -07:00 
						 
				 
			
				
					
						
							
							
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							aa6355ffe6 
							
						 
					 
					
						
						
							
							Updated master to 4.1.0  
						
						... 
						
						
						
						mvn release:update-versions -DautoVersionSubmodules=true -Dnonoss -P
client,deps,developer  -DdevelopmentVersion=4.1.0-SNAPSHOT 
						
						
					 
					
						2012-10-01 11:00:55 -07:00 
						 
				 
			
				
					
						
							
							
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							c9b0b0b1a9 
							
						 
					 
					
						
						
							
							Add Nicira configuration to the UI  
						
						
						
						
					 
					
						2012-09-30 23:33:37 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							11fe086ada 
							
						 
					 
					
						
						
							
							Fixing CLOUDSTACK-226: don't allow physical networks with overlaping vnet ranges, belong to the same zone. Fixed create and update physical network code  
						
						
						
						
					 
					
						2012-09-28 13:11:20 -07:00 
						 
				 
			
				
					
						
							
							
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							8ba7749869 
							
						 
					 
					
						
						
							
							Prepare all capabilities we will be supporting  
						
						... 
						
						
						
						Remove the logical router if we are done with it. 
						
						
					 
					
						2012-09-27 18:24:19 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							bbbccc0a7b 
							
						 
					 
					
						
						
							
							Port ranges for PF rules: public port start should be equal to ending port start; the same applies to end ports  
						
						
						
						
					 
					
						2012-09-27 10:50:04 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							2c2178ce10 
							
						 
					 
					
						
						
							
							Revert "Removed port ranges from createPortForwardingRule API"  
						
						... 
						
						
						
						This reverts commit d04f0b475285e45ae5a466626fb11704fe46fa99.
Conflicts:
	api/src/com/cloud/api/commands/CreatePortForwardingRuleCmd.java
Conflicts:
	api/src/com/cloud/api/commands/CreatePortForwardingRuleCmd.java 
						
						
					 
					
						2012-09-27 10:49:53 -07:00 
						 
				 
			
				
					
						
							
							
								Anthony Xu 
							
						 
					 
					
						
						
						
						
							
						
						
							780769b765 
							
						 
					 
					
						
						
							
							fix build  
						
						
						
						
					 
					
						2012-09-26 17:56:29 -07:00 
						 
				 
			
				
					
						
							
							
								Anthony Xu 
							
						 
					 
					
						
						
						
						
							
						
						
							ba8b418542 
							
						 
					 
					
						
						
							
							CS-16375:  do desetup network after last VM in guest network is gone  
						
						
						
						
					 
					
						2012-09-26 17:42:42 -07:00 
						 
				 
			
				
					
						
							
							
								Kishan Kavala 
							
						 
					 
					
						
						
						
						
							
						
						
							6540ff8fa1 
							
						 
					 
					
						
						
							
							bug CLOUDSTACK-198: VPN user add, on failure remove user currently being added only, other users will remain in Add state  
						
						
						
						
					 
					
						2012-09-26 13:54:49 +05:30 
						 
				 
			
				
					
						
							
							
								Jie Feng 
							
						 
					 
					
						
						
						
						
							
						
						
							c9aa08350a 
							
						 
					 
					
						
						
							
							[DOC] docbook conversion - choosing a deployment architecture  
						
						
						
						
					 
					
						2012-09-13 16:12:06 -04:00 
						 
				 
			
				
					
						
							
							
								Mice Xia 
							
						 
					 
					
						
						
						
						
							
						
						
							55bcfaf805 
							
						 
					 
					
						
						
							
							CLOUDSTACK-88  Cannot listVM by vpcId which is required by VPC UI  
						
						
						
						
					 
					
						2012-09-13 11:21:11 +08:00 
						 
				 
			
				
					
						
							
							
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							fe8a2992a2 
							
						 
					 
					
						
						
							
							Elimiate mystery guestIp in IpAddressTO  
						
						... 
						
						
						
						Nobody can explain why it's there...
Also fix wrong return result of several empty network element callbacks 
						
						
					 
					
						2012-09-12 15:42:48 -07:00 
						 
				 
			
				
					
						
							
							
								Koushik Das 
							
						 
					 
					
						
						
						
						
							
						
						
							65eeeaf071 
							
						 
					 
					
						
						
							
							CS-14277  
						
						... 
						
						
						
						Support for local data disk. Currently enable/disable config is at zone level, in subsequent checkins it can be made more granular.
    Following changes are made:
    - Create disk offering API now takes an extra parameter to denote storage type (local or shared). This is similar to storage type in service offering.
    - Create/delete of data volume on local storage
    - Attach/detach for local data volumes. Re-attach is allowed as long as vm host and data volume storage pool host is same.
    - Migration of VM instance is not supported if it uses local root or data volumes.
    - Migrate is not supported for local volumes.
    - Zone level config to enable/disable local storage usage for service and disk offerings.
    - Local storage gets discovered when a host is added/reconnected if zone level config is enabled. When disabled existing local storages are not removed but any new local storage is not added.
    - Deploy VM command validates service and disk offerings based on local storage config.
    - Upgrade uses the global config 'use.local.storage' to set the zone level config for local storage.
(cherry picked from commit 62710aed37606168012a0ed255a876c8e7954010) 
						
						
					 
					
						2012-09-11 17:22:43 +05:30 
						 
				 
			
				
					
						
							
							
								Fang Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							663e250334 
							
						 
					 
					
						
						
							
							Replace db-id by UUID for user VM's vm-id.  
						
						
						
						
					 
					
						2012-09-10 18:01:08 -07:00 
						 
				 
			
				
					
						
							
							
								Mice Xia 
							
						 
					 
					
						
						
						
						
							
						
						
							dd07d1598f 
							
						 
					 
					
						
						
							
							Fix Bug CloudStack-9 can not change OS preference from OS to none  
						
						
						
						
					 
					
						2012-09-04 20:51:03 +08:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							7272b8d56b 
							
						 
					 
					
						
						
							
							Applying the patch from  https://reviews.apache.org/r/5871/  
						
						... 
						
						
						
						Original committer: Venkata Siva Vijayendra Bhamidipati 
						
						
					 
					
						2012-08-30 10:33:07 -07:00 
						 
				 
			
				
					
						
							
							
								Likitha Shetty 
							
						 
					 
					
						
						
						
						
							
						
						
							8c3450b503 
							
						 
					 
					
						
						
							
							CS-14770. ec2-run-instances and ec2-describe-instances don't return keypair information. Component: AWSAPI.  
						
						
						
						
					 
					
						2012-08-28 13:52:42 -07:00 
						 
				 
			
				
					
						
							
							
								olivier lamy 
							
						 
					 
					
						
						
						
						
							
						
						
							a06ed5728c 
							
						 
					 
					
						
						
							
							remove intermediate parent poms  
						
						
						
						
					 
					
						2012-08-27 16:43:24 +02:00 
						 
				 
			
				
					
						
							
							
								olivier lamy 
							
						 
					 
					
						
						
						
						
							
						
						
							3aa469da2a 
							
						 
					 
					
						
						
							
							groupdId is now org.apache.cloudstack  
						
						
						
						
					 
					
						2012-08-25 09:20:21 +02:00 
						 
				 
			
				
					
						
							
							
								olivier lamy 
							
						 
					 
					
						
						
						
						
							
						
						
							5ef60aceb1 
							
						 
					 
					
						
						
							
							%s/tab/ws/  
						
						
						
						
					 
					
						2012-08-25 00:03:23 +02:00 
						 
				 
			
				
					
						
							
							
								Darren Shepherd 
							
						 
					 
					
						
						
						
						
							
						
						
							4a4007e652 
							
						 
					 
					
						
						
							
							Add license  
						
						
						
						
					 
					
						2012-08-24 11:18:54 -07:00 
						 
				 
			
				
					
						
							
							
								Darren Shepherd 
							
						 
					 
					
						
						
						
						
							
						
						
							ebc0fa458a 
							
						 
					 
					
						
						
							
							* Maven 3 support  
						
						... 
						
						
						
						* Pretty Format POM's
* AWS API compiles now 
						
						
					 
					
						2012-08-24 11:18:54 -07:00 
						 
				 
			
				
					
						
							
							
								Darren Shepherd 
							
						 
					 
					
						
						
						
						
							
						
						
							f826971fea 
							
						 
					 
					
						
						
							
							Maven config, initial commit  
						
						
						
						
					 
					
						2012-08-24 11:18:52 -07:00 
						 
				 
			
				
					
						
							
							
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							95347d2a5e 
							
						 
					 
					
						
						
							
							CS-16119: Fix wrong container name of updateVpnCustomerGateway  
						
						... 
						
						
						
						Reviewed-by: Frank Zhang 
						
						
					 
					
						2012-08-21 17:25:15 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							e252de4999 
							
						 
					 
					
						
						
							
							PublicIpAddress api response: new parameter "associatednetworkname" - the name of the guest network associated with the ip address  
						
						... 
						
						
						
						Reviewed-by: Frank Zhang
Conflicts:
	api/src/com/cloud/api/ApiConstants.java
	server/src/com/cloud/api/ApiResponseHelper.java 
						
						
					 
					
						2012-08-21 15:35:40 -07:00 
						 
				 
			
				
					
						
							
							
								kishan 
							
						 
					 
					
						
						
						
						
							
						
						
							691be5c60e 
							
						 
					 
					
						
						
							
							bug CS-15577: Added per gateway network usage for VPC and VPN usage. VPN usage uses 525 mark for outgoing traffic and 524 mark for incoming traffic  
						
						... 
						
						
						
						status CS-15577: resolved fixed 
						
						
					 
					
						2012-08-17 17:07:13 +05:30 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							335730dc65 
							
						 
					 
					
						
						
							
							CS-15999: added nics to domain router api response  
						
						... 
						
						
						
						Conflicts:
	server/src/com/cloud/api/ApiResponseHelper.java 
						
						
					 
					
						2012-08-16 10:50:09 -07:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							4b3af0c961 
							
						 
					 
					
						
						
							
							fixed typo  
						
						
						
						
					 
					
						2012-08-15 14:06:07 -07:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							e1bfcdc1be 
							
						 
					 
					
						
						
							
							fix a typo  
						
						
						
						
					 
					
						2012-08-15 13:53:43 -07:00 
						 
				 
			
				
					
						
							
							
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							a3faff94ff 
							
						 
					 
					
						
						
							
							S2S VPN: CS-15998: Fix wrong vpc id in Site2SiteVpnGatewayResponse  
						
						
						
						
					 
					
						2012-08-15 12:10:19 -07:00 
						 
				 
			
				
					
						
							
							
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							bda9d0a843 
							
						 
					 
					
						
						
							
							S2S VPN: Fix license headers  
						
						
						
						
					 
					
						2012-08-14 09:53:39 -07:00 
						 
				 
			
				
					
						
							
							
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							991fb3d189 
							
						 
					 
					
						
						
							
							S2S VPN: Fix wrong response name  
						
						
						
						
					 
					
						2012-08-14 09:53:35 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							7120ce0717 
							
						 
					 
					
						
						
							
							Fixed version number in upgrade script comment (replaced 3.0.3 with 3.0.2)  
						
						
						
						
					 
					
						2012-08-13 16:50:06 -07:00 
						 
				 
			
				
					
						
							
							
								tomoe@midokura.jp 
							
						 
					 
					
						
						
						
						
							
						
						
							ce12d0d70d 
							
						 
					 
					
						
						
							
							Submit Midokura SDN controller stubs  
						
						
						
						
					 
					
						2012-08-13 18:55:11 +05:30 
						 
				 
			
				
					
						
							
							
								Prasanna Santhanam 
							
						 
					 
					
						
						
						
						
							
						
						
							4161cea5df 
							
						 
					 
					
						
						
							
							CS-15833: PrepareForMigrationCommand extends Command  
						
						... 
						
						
						
						PrepareForMigrationCommand which was extending StartCommand wrongly now
extends the base Command only.
Signed-off-by: Prasanna Santhanam <Prasanna.Santhanam@citrix.com> 
						
						
					 
					
						2012-08-13 16:23:16 +05:30 
						 
				 
			
				
					
						
							
							
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							a50cf618ec 
							
						 
					 
					
						
						
							
							bug CS-15278: For removing clusters crossing threshold find out the list of cluster through db instead of iteratting cluster one by one in the java code.  
						
						
						
						
					 
					
						2012-08-13 16:20:57 +05:30 
						 
				 
			
				
					
						
							
							
								Mice Xia 
							
						 
					 
					
						
						
						
						
							
						
						
							17304b3910 
							
						 
					 
					
						
						
							
							Remove @author tag from non third-party source files in api folder  
						
						
						
						
					 
					
						2012-08-13 15:17:22 +08:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							bf1123246a 
							
						 
					 
					
						
						
							
							VPC : typo in CreateNetworkACLCmd.java  
						
						
						
						
					 
					
						2012-08-12 11:00:16 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							b61468d65c 
							
						 
					 
					
						
						
							
							Merge branch 'master' into vpc  
						
						... 
						
						
						
						Conflicts:
	plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java 
						
						
					 
					
						2012-08-11 18:27:18 -07:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							263216caa5 
							
						 
					 
					
						
						
							
							Adds CLVM as an option for primary storage. It copies most of the RBD bits, in most cases simply adding an 'else if' or similar. In the managesnapshot.sh we add the ability to manipulate snapshots for the CLVM volumes, as well as a few minor fixes like adjusting the usage for the -b option to reflect that it accepts four arguments (note that it already accepted four args, it just wasn't reflected in the usage).  
						
						... 
						
						
						
						RB: https://reviews.apache.org/r/6470/ 
Send-by: shadowsor@gmail.com  
						
						
					 
					
						2012-08-10 13:33:06 -07:00