From: Thomas Goirand <thomas@goirand.fr>
Date: Sat, 7 Jun 2014 09:26:56 +0000 (+0000)
Subject: Merge branch 'debian/icehouse' of ssh://git.debian.org/git/openstack/neutron into... 
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=039e18d7b9b8e5c361811ad757c707a5f170e5b9;p=openstack-build%2Fneutron-build.git

Merge branch 'debian/icehouse' of ssh://git.debian.org/git/openstack/neutron into debian/icehouse

Conflicts:
	debian/changelog
---

039e18d7b9b8e5c361811ad757c707a5f170e5b9
diff --cc debian/changelog
index a659c730e,1e64a0dad..c30edf0aa
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,8 +1,11 @@@
  neutron (2014.1-7) unstable; urgency=medium
  
 +  * Updates the OVS_lib_defer_apply_doesn_t_handle_concurrency.patch patch
 +    (Closes: #750415).
 +  * Now build-depends on openstack-pkg-tools (>= 12~).
+   * Added missing dbconfig-common dependency.
  
 - -- Thomas Goirand <zigo@debian.org>  Tue, 03 Jun 2014 15:46:32 +0800
 + -- Thomas Goirand <zigo@debian.org>  Thu, 05 Jun 2014 07:25:38 +0000
  
  neutron (2014.1-6) unstable; urgency=high