Funs 8a485b9b59 CLOUDSTACK-6967: Initial OVM3 drop ...

Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
(cherry picked from commit ed47763e2525a21fa4578d199492462d0fb1c7ef)

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

..

bindir

CLOUDSTACK-6847.Link.java and console proxy files have hardcoded value

2014-06-20 12:07:50 +02:00

db

CLOUDSTACK-6967: Initial OVM3 drop

2014-06-23 12:39:10 +02:00

dev

CLOUDSTACk-5674: Added fix for CLOUDSTACK-5674

2014-02-12 17:34:34 +05:30