Prachi Damle ed8ff40f7f Merge branch 'master' into planner_reserve ... Conflicts: api/src/org/apache/cloudstack/api/ApiConstants.java engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java server/src/com/cloud/configuration/ConfigurationManagerImpl.java server/src/com/cloud/server/ManagementServerImpl.java setup/db/db/schema-410to420.sql		2013-05-15 14:44:56 -07:00
..
dao	CLOUDSTACK-2517: fixed private gateway creation. Following fixes went in:	2013-05-15 13:12:51 -07:00
MockConfigurationManagerImpl.java	Merge branch 'master' into planner_reserve	2013-05-15 14:44:56 -07:00
MockNetworkManagerImpl.java	merge with master	2013-05-13 17:30:42 +05:30
MockNetworkModelImpl.java	merge master	2013-05-11 15:28:43 +05:30
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-2517: fixed private gateway creation. Following fixes went in:	2013-05-15 13:12:51 -07:00
MockVpcVirtualNetworkApplianceManager.java	CLOUDSTACK-768: ACL on private gateway	2013-05-13 19:24:23 +05:30
NetworkACLManagerTest.java	CLOUDSTACK-768: ACL on private gateway	2013-05-13 19:24:23 +05:30
NetworkACLServiceTest.java	Updated network acl service test to avoid default ACL modification	2013-05-15 14:20:29 +05:30
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	merge master	2013-05-11 15:28:43 +05:30
VpcTestConfiguration.java	merge master	2013-05-11 15:28:43 +05:30