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
..
acl/static-role-based	Add missing licenses	2013-10-23 15:20:08 -07:00
affinity-group-processors	Add missing licenses	2013-10-23 15:20:08 -07:00
alert-handlers	Fixed up the pom.xml to use dependencies specified in cloudstack pom	2013-08-02 13:51:47 -07:00
api	Add missing licenses	2013-10-23 15:20:08 -07:00
dedicated-resources	Merge remote-tracking branch 'origin/spring-modularization'	2013-10-23 11:14:42 -07:00
deployment-planners	Add missing licenses	2013-10-23 15:20:08 -07:00
event-bus/rabbitmq	Add Manage Context framework	2013-10-02 13:09:52 -07:00
file-systems/netapp	Refactor missed classes	2013-10-17 16:00:11 -07:00
host-allocators/random	Add missing licenses	2013-10-23 15:20:08 -07:00
hypervisors	Merge branch 'pluggable_vm_snapshot'	2013-10-25 16:47:17 -07:00
network-elements	CLOUDSTACK-4964: Cisco VNMC: Nexus password gets logged in MS logs during guest n/w implementation with VNMC provider	2013-10-25 17:58:15 +05:30
storage	Add missing licenses	2013-10-23 15:20:08 -07:00
storage-allocators/random	Updating pom.xml version numbers for release 4.3.0-SNAPSHOT	2013-08-01 10:35:00 -04:00
user-authenticators	Add missing licenses	2013-10-23 15:20:08 -07:00
pom.xml	CLOUDSTACK-2328: Linux native VXLAN support on KVM hypervisor	2013-09-26 23:37:18 +09:00