Rohit Yadav f56b96ad19 merge: Fast forward merge branch 'javelin' ... FF merge commit due to recent merge of master and then Edison's commit. Signed-off-by: Rohit Yadav <bhaisaab@apache.org>		2013-01-24 19:30:28 -08:00
..
acl/static-role-based	All merge conflicts resolved	2013-01-18 12:14:57 -08:00
api	Merge branch 'master' into javelin	2013-01-24 19:18:53 -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	spring: Fix component annotation for VolumeDaoImpl and CfgServerImpl	2013-01-24 15:40:40 -08:00
host-allocators/random	removed import of componentlocator and inject from all files	2013-01-10 11:44:47 -08:00
hypervisors	merge: Fast forward merge branch 'javelin'	2013-01-24 19:30:28 -08:00
network-elements	Fix the initialization of management server	2013-01-23 15:29:41 -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 'master' into javelin	2013-01-24 19:18:53 -08:00