Alex Huang 3df5571d2e Resolved merge conflicts		2013-08-12 20:15:24 -07:00
..
alert	CLOUDSTACK-1768: Ability to delete Events and Alerts: Delete by a time period is required.	2013-07-11 14:12:17 +05:30
api	CLOUDSTACK-1253: Remove @author tag.	2013-02-15 10:42:06 -08:00
capacity	Correcting the license header problem that was introduced with commit	2013-02-22 11:06:47 -05:00
configuration	UserContext switched to CallContext. Added generic storage mechanism for other code to carry information throughout a call. Made the calling User and Account a must have. Added an interface to carry entities in error. Fixed up the code. Part of the vmsync branch	2013-07-16 11:24:21 -07:00
event	CLOUDSTACK-1768: Ability to delete Events and Alerts: Delete by a time period is required.	2013-07-11 14:12:17 +05:30
keystore	Switched over to use the new jobs framework	2013-08-02 11:07:55 -07:00
metadata	add missing file	2013-05-11 15:02:12 +05:30
network	Revert "Reverting the range of commits that broke the build"	2013-08-08 15:02:40 -07:00
projects	Improve component lifecycle management with system run-level concept	2013-01-30 15:21:02 -08:00
resource	Resolved merge conflicts	2013-08-12 20:15:24 -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
user	AccountManager/Service: reduced visibility for methods that are called only from AccountManagerImpl itself	2013-05-30 11:18:32 -07:00
vm	Moved volume related code into cloud-engine-orchestration	2013-08-12 19:06:51 -07:00
vpc	Revert "Reverting the range of commits that broke the build"	2013-08-08 15:02:40 -07:00