Darren Shepherd 205a77a5bb Merge remote-tracking branch 'origin/txn-refactor' ... Conflicts: engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java server/src/com/cloud/configuration/ConfigurationManagerImpl.java server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java server/src/com/cloud/vm/UserVmManagerImpl.java		2013-10-23 10:40:44 -07:00
..
alert	Compile complete	2013-09-06 15:40:37 -07:00
api	Add license headers to fix build	2013-09-30 09:51:45 -07:00
capacity	Correcting the license header problem that was introduced with commit	2013-02-22 11:06:47 -05:00
configuration	New Transaction API	2013-10-16 09:21:00 -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
ha	Add license header	2013-10-05 12:18:34 -07:00
keystore	Switched over to use the new jobs framework	2013-08-02 11:07:55 -07:00
metadata	=Comment the test for now to unblock everyone. Will file a bug and fix it	2013-10-02 15:48:36 -07:00
network	Merge remote-tracking branch 'origin/txn-refactor'	2013-10-23 10:40:44 -07:00
projects	Improve component lifecycle management with system run-level concept	2013-01-30 15:21:02 -08:00
resource	Fixed up the agent separation. Added comments for config packaging.	2013-09-06 15:40:39 -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	CLOUDSTACK-4221: Dedicated Resources: changes to associate the dedicated resource with the 'ExplicitDedication' affinity group	2013-09-03 20:02:44 -07:00
vpc	CLOUDSTACK-4649:	2013-10-22 17:54:51 -07:00