cloudstack/scripts/storage
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
..
qcow2 CLOUDSTACK-4618: fix CLVM 2013-09-25 16:29:16 -07:00
secondary CLOUDSTACK-6967: Initial OVM3 drop 2014-06-23 12:39:10 +02:00
checkchildren.sh license header changes for scripts folder from Chip Childers 2012-06-23 00:58:00 -04:00
installIso.sh license header changes for scripts folder from Chip Childers 2012-06-23 00:58:00 -04:00