From: Thomas Goirand Date: Sat, 3 May 2014 03:21:46 +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=9848a77549fd6215828b3754af6331481560cbf7;p=openstack-build%2Fneutron-build.git Merge branch 'debian/icehouse' of ssh://git.debian.org/git/openstack/neutron into debian/icehouse Conflicts: debian/changelog Rewritten-From: 6298c540b10f60b58e73476f5fb79c99b4810eb2 --- 9848a77549fd6215828b3754af6331481560cbf7 diff --cc trusty/debian/changelog index 6396de96d,fb0c53a69..e2085d021 --- a/trusty/debian/changelog +++ b/trusty/debian/changelog @@@ -1,9 -1,9 +1,10 @@@ -neutron (2014.1-2) UNRELEASED; urgency=low +neutron (2014.1-2) unstable; urgency=medium - * Fixed fr.po (Closes: #745249). Thanks to Christian Perrier for this. + * Unbreaks fr.po, thanks to Christian Perrier (Closes: #745249). + * Added it.po thanks to Beatrice Torracca (Closes: #746575). + * Added a Provides: neutron-plugin-ml2 in neutron-common (LP: #1309858). - -- Thomas Goirand Sun, 20 Apr 2014 09:50:09 +0800 + -- Thomas Goirand Sat, 03 May 2014 02:22:50 +0000 neutron (2014.1-1) unstable; urgency=medium