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
..
kvm	Merge branch 'master' into javelin	2013-01-24 19:18:53 -08:00
ovm	Separate loadable components like Gurus, Elements, Adapters to componentContext.xml	2013-01-16 16:33:59 -08:00
simulator	Fixed the problems with simulator. Turned off the skip tests	2013-01-21 10:37:53 -08:00
vmware	nonoss compiled up til netscaler	2013-01-23 17:18:55 -08:00
xen	generalize storage orchestration: DataObjectManager will handle all the object life cycle management	2013-01-24 18:30:08 -08:00