Disabled ml2 config patch.

Change-Id: I6fe2073de3f361820f64064e9822ddbba4b9792b

diff --git a/debian/changelog b/debian/changelog
index a9e64f34e0c257e4868e1ba586ca983d97c02a58..e3aa574c4cbbafb289bf954fb464b5d0ac91f7b5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+neutron (2014.1.1-2) UNRELEASED; urgency=medium
+
+  * Disabled ml2 config patch.
+
+ -- Thomas Goirand <zigo@debian.org>  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 622da34acf4af5e2831d24cd3085499e9e181e0e..dc238470cc426188262b2dd7bb39f3173a6e82e4 100644 (file)
--- 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