cloudstack/engine
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
..
api CLOUDSTACK-6599: 2014-05-30 10:48:42 -07:00
components-api Fixed CLOUDSTACK-6756: usage id is not being returned for an ip in deleted ip range 2014-05-27 10:41:40 +05:30
network findbugs: exclude known spiffy hacks a.k.a. false positives 2014-03-28 14:28:10 +01:00
orchestration CLOUDSTACK-6830: Fixed during VM migration, volumes on zone wide primary store 2014-06-20 16:32:19 +05:30
schema CLOUDSTACK-6967: Initial OVM3 drop 2014-06-23 12:39:10 +02:00
service findbugs: exclude known spiffy hacks a.k.a. false positives 2014-03-28 14:28:10 +01:00
storage CLOUDSTACK-6967: Initial OVM3 drop 2014-06-23 12:39:10 +02:00
pom.xml Update master to 4.5.0-SNAPSHOT 2014-03-14 14:55:26 +01:00