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
..
common/keys	CLOUDSTACK-6563: Integrating dependencies as part of MSI installer so that those will get installed along with cloud stack installation	2014-05-16 10:50:32 +05:30
installer	CLOUDSTACK-6834: [Windows] 1. Added Port to the wizard to capture input from the admin.	2014-06-12 12:37:00 +05:30
network	CLOUDSTACK-5779: Move loadbalancer to use routerProxy	2014-01-20 18:48:46 -08:00
storage	CLOUDSTACK-6967: Initial OVM3 drop	2014-06-23 12:39:10 +02:00
util	CloudStack CLOUDSTACK-774	2013-02-21 15:46:11 -08:00
vm	CLOUDSTACK-6749: [OVS] xe network-param-get with	2014-06-13 16:02:31 +05:30
.pydevproject	License header updates for the scripts folder.	2012-08-03 09:38:28 -04:00