Alex Huang 8d21f49ec9 Another merge to pull in object store fix. Also to check how changes that are applied to both master and vmsync are merged		2013-07-03 15:01:23 -07:00
..
baremetal	Another merge to pull in object store fix. Also to check how changes that are applied to both master and vmsync are merged	2013-07-03 15:01:23 -07:00
kvm	Another merge from master. This is just getting laborious	2013-07-01 11:29:57 -07:00
ovm	merge is complete	2013-06-24 16:50:31 -07:00
simulator	Another merge from master. This is just getting laborious	2013-07-01 11:29:57 -07:00
ucs	UCS: Add missing beans	2013-06-27 14:54:45 -07:00
vmware	Another merge to pull in object store fix. Also to check how changes that are applied to both master and vmsync are merged	2013-07-03 15:01:23 -07:00
xen	Another merge from master. This is just getting laborious	2013-07-01 11:29:57 -07:00