Commit Graph

8 Commits

Author SHA1 Message Date
Kelven Yang 6fb1a1e6f1 Fix issues after another round of merge 2013-01-11 16:54:32 -08:00
Alex Huang 56e5fbdee2 removed import of componentlocator and inject from all files 2013-01-10 11:44:47 -08:00
David Nalley e87558256c Patch from Chip Childers
https://reviews.apache.org/r/5704/
License header updates for the server folder
2012-07-02 09:51:21 -04:00
frank 2f634c0913 Switch to Apache license 2012-04-03 04:50:05 -07:00
frank 3773b52b2f add cleanup.sql to DB upgrade test 2012-03-19 14:36:57 -07:00
frank ea007f833f use fake.sql for db upgrade test 2012-03-19 13:06:43 -07:00
alena 11ef6bbbe2 bug 9638: fixed bunch of DB upgrade bugs
status 9638: resolved fixed

Conflicts:

	server/src/com/cloud/upgrade/DatabaseUpgradeChecker.java
	utils/src/com/cloud/utils/net/NetUtils.java
2011-04-28 18:30:40 -07:00
alena 485f7a10cc bug 9621: dbUpgrade - set reservation strategy to be Create for Guest Nics in Basic zone
status 9621: resolved fixed

Conflicts:

	server/src/com/cloud/upgrade/dao/Upgrade218to22.java
	setup/db/db/schema-222to224.sql
2011-04-27 22:51:56 -07:00