Koushik Das 67f11d46ad Merge branch 'master' into cisco-vnmc-api-integration		2013-04-08 15:11:10 +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	…
src	Merge branch 'master' into cisco-vnmc-api-integration	2013-04-08 15:11:10 +05:30
test	Changing the number of threads in the test from 1000 to 750. 1000 will more often than not result in build failures due to constraints on the build systems.	2013-04-07 12:17:53 +02:00
pom.xml	Disabling broken test, see CLOUDSTACK-1884. Please revert this commit once the test itself is fixed.	2013-04-02 10:02:57 +02:00