frank 8416d81b99 Merge branch 'ucs' into javelin ... Conflicts: api/src/org/apache/cloudstack/api/ApiConstants.java plugins/pom.xml utils/src/com/cloud/utils/exception/CloudRuntimeException.java utils/src/com/cloud/utils/exception/RuntimeCloudException.java		2013-01-31 14:44:07 -08:00
..
acl/static-role-based	All merge conflicts resolved	2013-01-18 12:14:57 -08:00
api	Merge latest master into javelin	2013-01-31 11:34:49 -08:00
deployment-planners	Separate loadable components like Gurus, Elements, Adapters to componentContext.xml	2013-01-16 16:33:59 -08:00
file-systems/netapp	Improve component lifecycle management with system run-level concept	2013-01-30 15:21:02 -08:00
host-allocators/random	Improve component lifecycle management with system run-level concept	2013-01-30 15:21:02 -08:00
hypervisors	Merge branch 'ucs' into javelin	2013-01-31 14:44:07 -08:00
network-elements	Merge latest master into javelin	2013-01-31 11:34:49 -08:00
parent	Removed all the .project files	2013-01-08 14:11:00 -08:00
storage	skip test in cloud engine	2013-01-22 13:25:48 -08:00
storage-allocators/random	Removed all the .project files	2013-01-08 14:11:00 -08:00
user-authenticators	Separate loadable components like Gurus, Elements, Adapters to componentContext.xml	2013-01-16 16:33:59 -08:00
pom.xml	Merge branch 'ucs' into javelin	2013-01-31 14:44:07 -08:00