Alena Prokharchyk 3795048fcc Merge branch 'master' into internallb1 ... Conflicts: api/src/com/cloud/async/AsyncJob.java api/src/org/apache/cloudstack/api/ApiConstants.java api/src/org/apache/cloudstack/api/BaseCmd.java api/src/org/apache/cloudstack/api/ResponseGenerator.java client/tomcatconf/commands.properties.in server/src/com/cloud/api/ApiDBUtils.java server/src/com/cloud/api/ApiResponseHelper.java server/src/com/cloud/server/ManagementServerImpl.java setup/db/db/schema-410to420.sql		2013-04-11 14:16:33 -07:00
..
dao	CLOUDSTACK-749: updated mockvpcdao mockvpcmanagerimpl with external device related changes	2013-02-25 18:54:30 +05:30
MockConfigurationManagerImpl.java	API to list planners and set the planner in Service offering	2013-04-11 13:22:56 -07:00
MockNetworkManagerImpl.java	CLOUDSTACK-1895: save placeholder nic with not null vmType='DomainRouter' when placeholder is used for the VR ip address	2013-04-04 13:29:17 -07:00
MockNetworkModelImpl.java	InternalLB: modified InternalLbElement to start the Internal Lb vm for each ip address (if not already started)	2013-04-11 13:59:44 -07:00
MockResourceLimitManagerImpl.java	CLOUDSTACK-1156: Limit Primary and Secondary storage for domain/accounts	2013-03-29 11:26:38 +05:30
MockSite2SiteVpnManagerImpl.java	Improve component lifecycle management with system run-level concept	2013-01-30 15:21:02 -08:00
MockSite2SiteVpnServiceProvider.java	Improve component lifecycle management with system run-level concept	2013-01-30 15:21:02 -08:00
MockVpcManagerImpl.java	Fixes/improvements for VPC feature:	2013-03-29 16:56:01 -07:00
MockVpcVirtualNetworkApplianceManager.java	Internal LB: intermediate checkin - added InternalLBAppliance manager and managerImpl	2013-04-10 16:29:57 -07:00
Site2SiteVpnTest.java	fixed unit tests from merge	2013-01-18 15:58:55 -08:00
VpcApiUnitTest.java	Fixes/improvements for VPC feature:	2013-03-29 16:56:01 -07:00
VpcTestConfiguration.java	Removing ^M's from code.	2013-04-04 00:53:20 +05:30