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

..

db

Merge branch 'pluggable_vm_snapshot'

2013-10-25 16:47:17 -07:00

22beta4to22GA.sql

applying the commits from Chip Childers licensing cleanup

2012-06-26 10:44:04 -04:00

221to222upgrade.sh

applying the commits from Chip Childers licensing cleanup

2012-06-26 10:44:04 -04:00

create-database-premium.sql

applying the commits from Chip Childers licensing cleanup

2012-06-26 10:44:04 -04:00

create-database-simulator.sql

property files and build file fixes for simulator db changes

2012-09-17 17:33:26 +05:30

create-database.sql

applying the commits from Chip Childers licensing cleanup

2012-06-26 10:44:04 -04:00

create-schema-premium.sql

db: Refactor new change in create-schema/premium to schema40-410.sql

2013-02-16 17:12:26 +05:30

create-schema-simulator.sql

simulator: resurrect simulator hypervisor as plugin

2012-12-23 19:28:57 -08:00

create-schema.sql

CLOUDSTACK-681: Dedicated Resources - Explicit Dedication, Private zone, pod, cluster or host. <Patch1>

2013-05-30 01:07:01 -07:00

data-20to21.sql

applying the commits from Chip Childers licensing cleanup

2012-06-26 10:44:04 -04:00

data-22beta1to22beta2.sql

applying the commits from Chip Childers licensing cleanup

2012-06-26 10:44:04 -04:00

deploy-db-clouddev.sh

It's due to replace.properties is missing, by default the password is cloud for user cloud

2012-07-09 11:48:43 -07:00

deploy-db-dev.sh

db: Remove create-schema-view.sql, views are created using schema-40to410.sql

2013-02-17 23:49:27 +05:30

deploy-db-simulator.sh

db: Remove create-schema-view.sql, views are created using schema-40to410.sql

2013-02-17 23:49:27 +05:30

index-20to21.sql

applying the commits from Chip Childers licensing cleanup

2012-06-26 10:44:04 -04:00

index-212to213.sql

applying the commits from Chip Childers licensing cleanup

2012-06-26 10:44:04 -04:00

postprocess-20to21.sql

applying the commits from Chip Childers licensing cleanup

2012-06-26 10:44:04 -04:00

server-setup.sql

Remove updateUuids code in ConfigurationServerImpl (which is not the

2013-01-08 17:12:14 -08:00

server-setup.xml

Summary: Fix hanging references to /var/lib/cloud, changed to /var/cloudstack

2013-02-13 13:22:28 -07:00

templates.simulator.sql

image_data_store is not part of vm_template anymore

2013-06-20 16:44:49 +05:30

templates.sql

CLOUDSTACK-4872:VM provisioned using a registered Windows Server 2012

2013-10-15 13:56:13 -07:00