Funs 8a485b9b59 CLOUDSTACK-6967: Initial OVM3 drop ... Signed-off-by: Sebastien Goasguen <runseb@gmail.com> (cherry picked from commit ed47763e25) Conflicts: api/src/com/cloud/network/NetworkService.java api/src/org/apache/cloudstack/api/ApiConstants.java api/src/org/apache/cloudstack/api/command/admin/usage/AddTrafficTypeCmd.java engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotObject.java plugins/pom.xml server/src/com/cloud/network/NetworkServiceImpl.java server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java server/test/com/cloud/vpc/MockNetworkManagerImpl.java ui/scripts/docs.js		2014-06-23 12:39:10 +02:00
..
dao	region level VPC support	2014-03-20 16:32:22 +05:30
MockConfigurationManagerImpl.java	Reformatted all of the code.	2013-11-21 06:15:26 -08:00
MockNetworkManagerImpl.java	CLOUDSTACK-6967: Initial OVM3 drop	2014-06-23 12:39:10 +02:00
MockNetworkModelImpl.java	Disable IAM feature from 4.4 release.	2014-05-22 18:27:08 -07:00
MockResourceLimitManagerImpl.java	Merge branch 'master' into rbac.	2014-01-17 14:37:08 -08:00
MockSite2SiteVpnManagerImpl.java	Display flag support for VpnConnection/VpnGateway/RemoteAccessVpn	2014-02-21 14:51:22 -08:00
MockSite2SiteVpnServiceProvider.java	Improve component lifecycle management with system run-level concept	2013-01-30 15:21:02 -08:00
MockVpcVirtualNetworkApplianceManager.java	CLOUDSTACK-6047: Enable VR aggregation commands for VR start/reboot	2014-03-11 13:04:26 -07:00
NetworkACLManagerTest.java	fix unit-test failure	2014-03-14 17:19:27 +05:30
NetworkACLServiceTest.java	Fixed unittest	2014-02-21 14:29:00 -08:00
Site2SiteVpnTest.java	Removed trailing spaces	2013-11-21 04:08:01 -08:00
VpcApiUnitTest.java	region level VPC support	2014-03-20 16:32:22 +05:30
VpcTestConfiguration.java	All Checkstyle problems corrected	2013-12-12 12:26:07 -08:00