Alex Huang 4a9cf4b4a8 Merge branch 'javelin' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack into javelin		2013-01-18 15:59:24 -08:00
..
acl/static-role-based	All merge conflicts resolved	2013-01-18 12:14:57 -08:00
api/discovery	All merge conflicts resolved	2013-01-18 12:14:57 -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	All merge conflicts resolved	2013-01-18 12:14:57 -08:00
host-allocators/random	removed import of componentlocator and inject from all files	2013-01-10 11:44:47 -08:00
hypervisors	Merge branch 'javelin' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack into javelin	2013-01-18 15:59:24 -08:00
network-elements	All merge conflicts resolved	2013-01-18 12:14:57 -08:00
parent	Removed all the .project files	2013-01-08 14:11:00 -08:00
storage	implement toURI	2013-01-17 18:49:50 -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	refactor api, based on suggestion from community	2013-01-14 18:52:39 -08:00