Alena Prokharchyk 1cff609347 Merge branch 'master' into internallb1 ... Conflicts: server/src/com/cloud/network/NetworkModelImpl.java server/src/com/cloud/network/NetworkServiceImpl.java server/src/com/cloud/server/ManagementServerImpl.java server/test/com/cloud/network/MockNetworkManagerImpl.java server/test/com/cloud/vpc/MockNetworkManagerImpl.java		2013-05-03 12:50:59 -07:00
..
dao	Internal Lb: added 2 boolean fields - internal_lb and public_lb - to the network offering. Define if internal or public LB service is supported. In the current release it's either one or another; in the future releases we might support both on the same network	2013-04-16 11:33:42 -07:00
MockConfigurationManagerImpl.java	Merge branch 'master' into internallb1	2013-04-29 16:12:10 -07:00
MockNetworkManagerImpl.java	Merge branch 'master' into internallb1	2013-05-03 12:50:59 -07:00
MockNetworkModelImpl.java	Merge branch 'master' into internallb1	2013-04-29 16:12:10 -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	InternalLbVm: support for start/stop Internal lb vm	2013-04-15 11:36:52 -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
VpcTestConfiguration.java	Fixed VPC api unittests	2013-04-19 11:26:32 -07:00