5 Commits

Author	SHA1	Message	Date
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
Alex Huang	7b7db0560c	merge is complete	2013-06-24 16:50:31 -07:00
Alex Huang	e2edae1711	Merge from master	2013-06-17 19:00:44 -07:00
Alex Huang	3a074f31ae	Removed a bunch of useless classes. Move configuration into utils package	2013-06-17 17:04:04 -07:00
Alex Huang	aff0220d45	Moved files into cloud-engine	2013-06-13 16:34:41 -07:00