mirror of https://github.com/apache/cloudstack.git
bug 8601: merge from 2.2.2 to master
This commit is contained in:
parent
f85ef91a8d
commit
ade92456df
|
|
@ -26,6 +26,6 @@ update data_center set dns_provider='DhcpServer', dhcp_provider='DhcpServer', us
|
|||
update network_offerings set specify_vlan=1 where system_only=0 and guest_type='Direct';
|
||||
update networks set traffic_type='Guest' where network_offering_id in (select id from network_offerings where system_only=0);
|
||||
update network_offerings set availability='Optional' where id=7;
|
||||
delete from configuration where name='router.cleanup';
|
||||
delete from configuration where name='router.cleanup.interval';
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -24,4 +24,4 @@ update data_center set dns_provider='DhcpServer', dhcp_provider='DhcpServer', us
|
|||
update network_offerings set specify_vlan=1 where system_only=0 and guest_type='Direct';
|
||||
update networks set traffic_type='Guest' where network_offering_id in (select id from network_offerings where system_only=0);
|
||||
update network_offerings set availability='Optional' where id=7;
|
||||
delete from configuration where name='router.cleanup';
|
||||
delete from configuration where name='router.cleanup.interval';
|
||||
|
|
|
|||
Loading…
Reference in New Issue