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
Alena Prokharchyk 1b8a6986a6 Merge branch 'master' into internallb1 
Conflicts:
	api/src/com/cloud/async/AsyncJob.java
	api/src/com/cloud/network/NetworkModel.java
	api/src/com/cloud/network/rules/LoadBalancerContainer.java
	api/src/org/apache/cloudstack/api/BaseCmd.java
	api/src/org/apache/cloudstack/api/ResponseGenerator.java
	api/src/org/apache/cloudstack/network/lb/ApplicationLoadBalancerContainer.java
	client/tomcatconf/commands.properties.in
	engine/schema/src/com/cloud/network/dao/LoadBalancerDaoImpl.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/NetworkModelImpl.java
	server/src/com/cloud/network/NetworkServiceImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/test/com/cloud/network/MockNetworkModelImpl.java
	server/test/com/cloud/vpc/MockNetworkManagerImpl.java
	server/test/com/cloud/vpc/MockNetworkModelImpl.java
	server/test/resources/appLoadBalancer.xml
	setup/db/db/schema-410to420.sql
	test/integration/component/test_multiple_ip_ranges.py
	test/integration/smoke/test_guest_vlan_range.py
	tools/marvin/marvin/integration/lib/base.py
 		2013-05-08 13:29:43 -07:00
..
db Merge branch 'master' into internallb1 2013-05-08 13:29:43 -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 Added fixes for CLOUDSTACK-1839. Missing lots of indexes due to a rollback to 4.0 by Rohit 2013-04-03 14:42:47 +01: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 maven+marvin+simulator: Changes to the lifecycle steps 2013-04-02 19:56:33 +05:30
templates.sql CLOUDSTACK-2296: Support for Windows 8 and Windows Server 2012 as VM Guest OS on Xenserver 2013-04-30 16:23:41 +05:30