Alex Huang 3ecc52a4f3 Re-absorb delta in master into vmsync		2013-07-03 17:58:38 -07:00
..
agent	merge is complete	2013-06-24 16:50:31 -07:00
alert	Add missing Apache license header.	2013-03-08 14:38:35 -08:00
api	CLOUDSTACK-1253: Remove @author tag.	2013-02-15 10:42:06 -08:00
async	Added RAT	2013-06-25 04:18:40 -07:00
capacity	Correcting the license header problem that was introduced with commit	2013-02-22 11:06:47 -05:00
configuration	Fix test cases in OSS build caused by CallContext changes	2013-06-20 18:03:08 -07:00
event	CLOUDSTACK-1904: API : UI : Admin can not delete Events/Archive from other accounts	2013-05-15 19:41:48 -07:00
keystore	Add VM work job dispatcher, MethodCapturer etc	2013-04-30 18:12:23 -07:00
metadata	add missing file	2013-05-11 15:02:12 +05:30
network	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
projects	Improve component lifecycle management with system run-level concept	2013-01-30 15:21:02 -08:00
resource	Moved HostAllocator and PodAllocator from server to api package, where they are supposed to be. In the process, I had to change the VO objects used by these two itnerfaces to interface equivalent. This makes sense because there's really no reasons why allocators require write access to the database. One of the files have been reformatted because it contained a bunch of tabs instead of spaces for indentation.	2013-07-03 17:48:53 -07:00
resourcelimit	CLOUDSTACK-1156: Limit Primary and Secondary storage for domain/accounts	2013-03-29 11:26:38 +05:30
server	ConfigurationServerImplTest: remove long running test	2013-06-03 14:48:29 +05:30
snapshot	merge master	2013-05-11 15:28:43 +05:30
storage/dao	merge master	2013-05-11 15:28:43 +05:30
upgrade	ignore the tests looking for db	2013-03-01 12:04:06 +05:30
user	AccountManager/Service: reduced visibility for methods that are called only from AccountManagerImpl itself	2013-05-30 11:18:32 -07:00
vm	CLOUDSTACK-2107	2013-07-03 18:40:22 +05:30
vpc	Another merge from master. This is just getting laborious	2013-07-01 11:29:57 -07:00