From 353f2fc5d3b59bf720dd3a175fa77077d43da0e4 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Tue, 10 Jun 2014 20:53:41 +0800 Subject: [PATCH] Disabled ml2 config patch. Change-Id: I6fe2073de3f361820f64064e9822ddbba4b9792b --- debian/changelog | 6 ++++++ debian/patches/series | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index a9e64f34e..e3aa574c4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +neutron (2014.1.1-2) UNRELEASED; urgency=medium + + * Disabled ml2 config patch. + + -- Thomas Goirand Tue, 10 Jun 2014 20:53:20 +0800 + neutron (2014.1.1-1) unstable; urgency=medium * New upstream release. diff --git a/debian/patches/series b/debian/patches/series index 622da34ac..dc238470c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,5 +3,5 @@ better-config-default.patch 0001-Add-parameter-and-iptables-rules-to-protect-dnsmasq-.patch 0004-Fix-Metering-doesn-t-respect-the-l3-agent-binding.patch Properly_apply_column_default_in_migration_pool_monitor_status.patch -sane-defaults-for-ml2_conf.ini.patch +#sane-defaults-for-ml2_conf.ini.patch sane-defaults-for-dhcp_agent.ini.patch -- 2.45.2