etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/setup/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
..
db Merge branch 'master' into test-merge-api 2012-12-23 13:54:46 -08: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-index-fk.sql Add a proper contraint to the nicira nic map 2012-09-22 11:29:39 +02:00
create-schema-premium.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
create-schema-simulator.sql simulator:Using the priority to decide b/w MASTER/BACKUP 2012-12-22 14:09:59 -08:00
create-schema.sql Merge branch 'master' into test-merge-api 2012-12-23 13:54:46 -08: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 Fix the right file 2012-08-31 14:30:25 +02:00
deploy-db-simulator.sh property files and build file fixes for simulator db changes 2012-09-17 17:33:26 +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 applying the commits from Chip Childers licensing cleanup 2012-06-26 10:44:04 -04:00
server-setup.xml License header updates for the setup folder. 2012-08-03 09:49:02 -04:00
templates.kvm.sql applying the commits from Chip Childers licensing cleanup 2012-06-26 10:44:04 -04:00
templates.simulator.sql applying the commits from Chip Childers licensing cleanup 2012-06-26 10:44:04 -04:00
templates.sql Fix Bug CloudStack-9 can not change OS preference from OS to none 2012-09-04 20:51:03 +08:00
templates.vmware.sql applying the commits from Chip Childers licensing cleanup 2012-06-26 10:44:04 -04:00
templates.xenserver.sql applying the commits from Chip Childers licensing cleanup 2012-06-26 10:44:04 -04:00