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

..

resources/META-INF/cloudstack

Removed "host" config parameter definition from ClusterManager interface as it got moved to cloud-api package

2014-01-21 17:19:52 -08:00

src

CLOUDSTACK-6967: Initial OVM3 drop

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

test

Merge branch 'master' into marvin

2014-04-08 17:53:37 +05:30

findbugsExcludeFilter.xml

findbugs: exclude known spiffy hacks a.k.a. false positives

2014-03-28 14:28:10 +01:00

pom.xml

Update master to 4.5.0-SNAPSHOT

2014-03-14 14:55:26 +01:00