Edison Su 51a8086cf6 Merge branch 'pluggable_vm_snapshot' ... Conflicts: client/tomcatconf/applicationContext.xml.in engine/storage/integration-test/test/org/apache/cloudstack/storage/test/SnapshotTest.java engine/storage/integration-test/test/resources/storageContext.xml server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java		2013-10-25 16:47:17 -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	Made all resource details DAOs (nic_details, user_vm_details, template_details, volume_details, service_offering_details) extend from the same base class as although details are being stored in diff tables, those tables have the same structure and same accessors.	2013-10-25 10:56:19 -07:00
network	ResourceDetails:	2013-10-24 15:54:49 -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	move a lot of code into vmsnapshot strategy	2013-10-25 15:09:04 -07:00
vpc	CLOUDSTACK-754: Enable Remote Access VPN for VPC	2013-10-24 17:34:41 -07:00