etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/setup
History
Koushik Das 0232048f90 Merge branch 'master' into cisco-vnmc-api-integration 
Conflicts:
	api/src/org/apache/cloudstack/api/ApiConstants.java
	client/tomcatconf/commands.properties.in
	setup/db/db/schema-410to420.sql
	tools/marvin/marvin/integration/lib/base.py
 		2013-04-15 17:05:59 +05:30
..
bindir packaging: move jasypt jar to cloudstack-common 2013-04-05 16:12:27 +02:00
db Merge branch 'master' into cisco-vnmc-api-integration 2013-04-15 17:05:59 +05:30
dev maven+marvin: Fix up the activation property 2013-04-10 16:16:41 +05:30