etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/setup
History
Prachi Damle 4a1eaf45bd Merge branch 'master' into affinity_groups 
Conflicts:
	engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VMEntityManagerImpl.java
	setup/db/db/schema-410to420.sql
 		2013-04-10 11:34:30 -07:00
..
bindir packaging: move jasypt jar to cloudstack-common 2013-04-05 16:12:27 +02:00
db Merge branch 'master' into affinity_groups 2013-04-10 11:34:30 -07:00
dev maven+marvin: Fix up the activation property 2013-04-10 16:16:41 +05:30