Prachi Damle 55eabcff2c Merge branch 'master' into planner_reserve ... Conflicts: engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java server/src/com/cloud/server/ManagementServerImpl.java setup/db/db/schema-410to420.sql		2013-05-09 17:36:59 -07:00
..
dao	CLOUDSTACK-747: Internal LB between VPC tiers support	2013-05-09 11:54:41 -07:00
MockConfigurationManagerImpl.java	Merge branch 'master' into planner_reserve	2013-05-09 17:36:59 -07:00
MockNetworkManagerImpl.java	CLOUDSTACK-747: Internal LB between VPC tiers support	2013-05-09 11:54:41 -07:00
MockNetworkModelImpl.java	CLOUDSTACK-747: Internal LB between VPC tiers support	2013-05-09 11:54:41 -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	CLOUDSTACK-1828 Source Nat on private gateway feature	2013-05-02 15:40:15 +05:30
MockVpcVirtualNetworkApplianceManager.java	CLOUDSTACK-747: Internal LB between VPC tiers support	2013-05-09 11:54:41 -07:00
Site2SiteVpnTest.java	Fixed VPC api unittests	2013-04-19 11:26:32 -07:00
VpcApiUnitTest.java	Fixed VPC api unittests	2013-04-19 11:26:32 -07:00
VpcTest.java	CLOUDSTACK-869 nTier Apps 2.0 : Support NetScalar as external LB provider	2013-05-09 15:23:00 +05:30
VpcTestConfiguration.java	Fixed up unit testing to use only an in class TestConfiguration	2013-05-06 16:34:27 -07:00