etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss

This commit is contained in:
David Nalley 2011-09-13 14:23:35 -04:00
parent 62157f2550 2dcdb946d2
commit c4c0e69425
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build/developer.xml
View File

@ -335,11 +335,6 @@
<include name="**/${test}.java"/>
</fileset>
</batchtest>
<junitreport todir="${unittest.dir}">
<fileset dir="${unittest.dir}"/>
<report todir="${unittest.dir}/test-reports"/>
</junitreport>
<fail if="junit.failure" message="Unit test(s) failed. See reports!"/>
</junit>
<junitreport todir="${unittest.dir}">
<fileset dir="${unittest.dir}"/>

9
setup/db/db/schema-2211to2212.sql
View File

@ -17,6 +17,9 @@ DELETE FROM `cloud`.`configuration` where name='vmware.guest.nic.device.type';
INSERT IGNORE INTO configuration VALUES ('Advanced', 'DEFAULT', 'management-server', 'agent.lb.enabled', 'true', 'If agent load balancing enabled in cluster setup');
update `cloud`.`vm_template` set hypervisor_type='XenServer' where unique_name='xs-tools.iso';
ALTER TABLE `cloud`.`host` MODIFY COLUMN `storage_ip_address` char(40);
ALTER TABLE `cloud`.`host` MODIFY COLUMN `storage_ip_address` char(40);
ALTER TABLE `cloud`.`resource_count` ADD UNIQUE `i_resource_count__type_accountId`(`type`, `account_id`);
ALTER TABLE `cloud`.`resource_count` ADD UNIQUE `i_resource_count__type_domaintId`(`type`, `domain_id`);