cloudstack/setup/db
Alena Prokharchyk a1acfd3bfa Merge branch 'master' into vpc
Conflicts:
	api/src/com/cloud/api/ApiConstants.java
	api/src/com/cloud/network/Network.java
	client/tomcatconf/components.xml.in
	plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java
	server/src/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java
	server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/guru/GuestNetworkGuru.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java
	setup/db/create-schema.sql
2012-07-13 13:52:58 -07:00
..
db applying the commits from Chip Childers licensing cleanup 2012-06-26 10:44:04 -04: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
clouddev.sql add clouddev 2012-06-27 23:28:34 -07:00
create-database-premium.sql applying the commits from Chip Childers licensing cleanup 2012-06-26 10:44:04 -04:00
create-database.sql applying the commits from Chip Childers licensing cleanup 2012-06-26 10:44:04 -04:00
create-index-fk.sql applying the commits from Chip Childers licensing cleanup 2012-06-26 10:44:04 -04:00
create-schema-premium.sql applying the commits from Chip Childers licensing cleanup 2012-06-26 10:44:04 -04:00
create-schema-simulator.sql applying the commits from Chip Childers licensing cleanup 2012-06-26 10:44:04 -04:00
create-schema.sql Merge branch 'master' into vpc 2012-07-13 13:52:58 -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 applying the commits from Chip Childers licensing cleanup 2012-06-26 10:44:04 -04:00
deploy-db-simulator.sh From: jason.bausewein@tier3.com 2012-07-03 15:16:51 -07:00
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 Revert zone guest cidr setting 2012-02-08 15:54:16 -08: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 applying the commits from Chip Childers licensing cleanup 2012-06-26 10:44:04 -04: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