Min Chen fbfc5c6894 Merge from master and fix conflicts		2013-02-25 11:53:24 -08:00
..
api	All merge conflicts resolved	2013-01-18 12:14:57 -08:00
ha	Improve component lifecycle management with system run-level concept	2013-01-30 15:21:02 -08:00
hypervisor	Merge from master and fix conflicts	2013-02-25 11:53:24 -08:00
network	Put nonoss under Spring framework	2013-01-25 15:41:48 -08:00
storage/resource	Upgrade to use Vsphere 5.1 SDK jar, fixed all compilation error with new	2013-02-04 17:41:36 -08:00