apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity
35,597 Commits 304 Branches 324 Tags
Commit Graph

104 Commits

Author SHA1 Message Date
Daan Hoogland
aa1ce9a363 rats 2014-06-23 16:39:10 +02:00
Funs Kessen
4610c76fa9 CLOUDSTACK-6967 merge problem resolution 2014-06-23 15:08:51 +02:00
Funs
189972bc7c CLOUDSTACK-6967: Now with module! 
Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
(cherry picked from commit 1516b041bc762535b8f2e74bcb1e6594e5657f86)
 2014-06-23 12:39:23 +02:00
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