etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/setup/db/db
History
Rohit Yadav 296b49c2f8 Merge branch 'master' into test-merge-api 
Conflicts:
	api/src/com/cloud/agent/api/BackupSnapshotCommand.java
	api/src/com/cloud/agent/api/storage/PrimaryStorageDownloadCommand.java
	api/src/com/cloud/agent/api/to/PortForwardingRuleTO.java
	api/src/com/cloud/network/NetworkService.java
	api/src/com/cloud/resource/ResourceService.java
	api/src/org/apache/cloudstack/api/ApiConstants.java
	api/src/org/apache/cloudstack/api/ResponseGenerator.java
	api/src/org/apache/cloudstack/api/response/SSHKeyPairResponse.java
	client/tomcatconf/commands.properties.in
	core/src/com/cloud/storage/SnapshotVO.java
	pom.xml
	server/src/com/cloud/api/ApiDispatcher.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java
	server/src/com/cloud/offerings/NetworkOfferingVO.java
	server/src/com/cloud/resource/ResourceManagerImpl.java
	server/src/com/cloud/upgrade/dao/Upgrade40to41.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/test/com/cloud/vpc/MockNetworkManagerImpl.java
	setup/db/create-schema.sql
	setup/db/db/schema-40to410.sql

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 		2012-12-23 13:54:46 -08:00
..
data-217to218.sql applying the commits from Chip Childers licensing cleanup 2012-06-26 10:44:04 -04:00
schema-20to21.sql applying the commits from Chip Childers licensing cleanup 2012-06-26 10:44:04 -04:00
schema-21to22-cleanup.sql applying the commits from Chip Childers licensing cleanup 2012-06-26 10:44:04 -04:00
schema-21to22-premium.sql applying the commits from Chip Childers licensing cleanup 2012-06-26 10:44:04 -04:00
schema-21to22.sql applying the commits from Chip Childers licensing cleanup 2012-06-26 10:44:04 -04:00
schema-22beta1to22beta2.sql applying the commits from Chip Childers licensing cleanup 2012-06-26 10:44:04 -04:00
schema-22beta3to22beta4.sql applying the commits from Chip Childers licensing cleanup 2012-06-26 10:44:04 -04:00
schema-30to301.sql Ensuring system user has password set. 2012-10-07 12:51:52 -07:00
schema-40to410.sql Merge branch 'master' into test-merge-api 2012-12-23 13:54:46 -08:00
schema-217to218.sql applying the commits from Chip Childers licensing cleanup 2012-06-26 10:44:04 -04:00
schema-221to222-cleanup.sql applying the commits from Chip Childers licensing cleanup 2012-06-26 10:44:04 -04:00
schema-221to222-premium.sql applying the commits from Chip Childers licensing cleanup 2012-06-26 10:44:04 -04:00
schema-221to222.sql applying the commits from Chip Childers licensing cleanup 2012-06-26 10:44:04 -04:00
schema-222to224-cleanup.sql applying the commits from Chip Childers licensing cleanup 2012-06-26 10:44:04 -04:00
schema-222to224-premium.sql applying the commits from Chip Childers licensing cleanup 2012-06-26 10:44:04 -04:00
schema-222to224.sql applying the commits from Chip Childers licensing cleanup 2012-06-26 10:44:04 -04:00
schema-224to225-cleanup.sql applying the commits from Chip Childers licensing cleanup 2012-06-26 10:44:04 -04:00
schema-224to225.sql applying the commits from Chip Childers licensing cleanup 2012-06-26 10:44:04 -04:00
schema-225to226.sql applying the commits from Chip Childers licensing cleanup 2012-06-26 10:44:04 -04:00
schema-227to228-premium.sql applying the commits from Chip Childers licensing cleanup 2012-06-26 10:44:04 -04:00
schema-227to228.sql applying the commits from Chip Childers licensing cleanup 2012-06-26 10:44:04 -04:00
schema-228to229.sql applying the commits from Chip Childers licensing cleanup 2012-06-26 10:44:04 -04:00
schema-229to2210.sql applying the commits from Chip Childers licensing cleanup 2012-06-26 10:44:04 -04:00
schema-301to302-cleanup.sql applying the commits from Chip Childers licensing cleanup 2012-06-26 10:44:04 -04:00
schema-301to302.sql Ensuring system user has password set. 2012-10-07 12:51:52 -07:00
schema-302to40-cleanup.sql Fixed version number in upgrade script comment (replaced 3.0.3 with 3.0.2) 2012-08-13 16:50:06 -07:00
schema-302to40.sql CLOUDSTACK-560 : Add default zone column to account table in cloud_usage table in fresh install and upgrade 2012-12-10 19:37:57 +05:30
schema-2210to2211.sql applying the commits from Chip Childers licensing cleanup 2012-06-26 10:44:04 -04:00
schema-2211to2212-premium.sql applying the commits from Chip Childers licensing cleanup 2012-06-26 10:44:04 -04:00
schema-2211to2212.sql applying the commits from Chip Childers licensing cleanup 2012-06-26 10:44:04 -04:00
schema-2212to2213.sql applying the commits from Chip Childers licensing cleanup 2012-06-26 10:44:04 -04:00
schema-2213to2214.sql applying the commits from Chip Childers licensing cleanup 2012-06-26 10:44:04 -04:00
schema-2214to30-cleanup.sql applying the commits from Chip Childers licensing cleanup 2012-06-26 10:44:04 -04:00
schema-2214to30.sql port fix for CS-16214 2012-10-05 19:41:51 -07:00
schema-level.sql applying the commits from Chip Childers licensing cleanup 2012-06-26 10:44:04 -04:00
schema-snapshot-217to224.sql applying the commits from Chip Childers licensing cleanup 2012-06-26 10:44:04 -04:00
schema-snapshot-223to224.sql applying the commits from Chip Childers licensing cleanup 2012-06-26 10:44:04 -04:00