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
..
affinity	Fix test cases in OSS build caused by CallContext changes	2013-06-20 18:03:08 -07:00
lb	Fix test cases in OSS build caused by CallContext changes	2013-06-20 18:03:08 -07:00
networkoffering	merge is complete	2013-06-24 16:50:31 -07:00
privategw	CLOUDSTACK-768: ACL on private gateway	2013-05-13 19:24:23 +05:30
region	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