etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/server
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
..
conf conf: Add a @ so @MSUSER@ is replaced by "cloud" 2013-04-03 16:54:00 +02:00
resources/com/cloud/upgrade CLOUDSTACK-1818: add a missing file that is missed in previous patch 2013-03-29 11:12:36 -07:00
scripts License header updates for the server folder. 2012-08-03 09:41:27 -04:00
src Merge branch 'master' into cisco-vnmc-api-integration 2013-04-15 17:05:59 +05:30
test CLOUDSTACK-312: enable L4-L7 network services in the shared network in 2013-04-14 17:50:15 +05:30
pom.xml CLOUDSTACK-1884: fix the unit test issue 2013-04-11 17:23:49 -07:00