Alex Huang 3ecc52a4f3 Re-absorb delta in master into vmsync		2013-07-03 17:58:38 -07:00
..
com/cloud	Re-absorb delta in master into vmsync	2013-07-03 17:58:38 -07:00
org/apache/cloudstack	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
resources	Fix test cases in OSS build caused by CallContext changes	2013-06-20 18:03:08 -07:00