Alena Prokharchyk 0cfe96bd00 Merge branch 'master' into internallb1 ... Conflicts: api/src/com/cloud/network/IpAddress.java server/src/com/cloud/network/NetworkServiceImpl.java setup/db/db/schema-410to420.sql		2013-04-17 15:51:05 -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-17 15:51:05 -07:00
MockNetworkManagerImpl.java	Merge branch 'master' into internallb1	2013-04-17 15:51:05 -07:00
MockNetworkModelImpl.java	InternalLB: allow to specify more than one provider for the LB service when create network offering as diff providers can support internal and public LB for the same network	2013-04-16 09:50:07 -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	InternalLbVm: support for start/stop Internal lb vm	2013-04-15 11:36:52 -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