etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/setup
History
Alena Prokharchyk 1cff609347 Merge branch 'master' into internallb1 
Conflicts:
	server/src/com/cloud/network/NetworkModelImpl.java
	server/src/com/cloud/network/NetworkServiceImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
	server/test/com/cloud/vpc/MockNetworkManagerImpl.java
 		2013-05-03 12:50:59 -07:00
..
bindir packaging: move jasypt jar to cloudstack-common 2013-04-05 16:12:27 +02:00
db Merge branch 'master' into internallb1 2013-05-03 12:50:59 -07:00
dev maven+marvin: Fix up the activation property 2013-04-10 16:16:41 +05:30