From ade92456df4aaa407b5de4eabd7cf5199eddaaf9 Mon Sep 17 00:00:00 2001 From: abhishek Date: Fri, 4 Mar 2011 16:31:58 -0800 Subject: [PATCH] bug 8601: merge from 2.2.2 to master --- setup/db/221to222.sql | 2 +- setup/db/schema-221to222.sql | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/setup/db/221to222.sql b/setup/db/221to222.sql index 82e441024c4..2413314fd67 100644 --- a/setup/db/221to222.sql +++ b/setup/db/221to222.sql @@ -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'; diff --git a/setup/db/schema-221to222.sql b/setup/db/schema-221to222.sql index f4e1b64a437..af4b9adaddb 100644 --- a/setup/db/schema-221to222.sql +++ b/setup/db/schema-221to222.sql @@ -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';