From 61c96ce1106f1fd418f347a035683eeeb509fb47 Mon Sep 17 00:00:00 2001 From: iberezovskiy Date: Mon, 6 Apr 2015 16:56:42 +0300 Subject: [PATCH] Fix requirements.txt to support netaddr 0.7.14 MOS mirrors contain newer version of netaddr than specified in requirements.txt (0.7.14). So update for requirements.txt patch is required to support it LP #1439079 Change-Id: I98f50ef07e01e23702372020ede3f1a945bab28c --- trusty/debian/changelog | 7 +++++++ trusty/debian/patches/fix-requirements.patch | 6 ++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/trusty/debian/changelog b/trusty/debian/changelog index e2c317b..b1e7214 100644 --- a/trusty/debian/changelog +++ b/trusty/debian/changelog @@ -1,3 +1,10 @@ +ceilometer (2014.2.2-fuel6.1-14.04-3) trusty; urgency=medium + + * Fixed patch for requirements.txt, removed upper bound for netaddr + because MOS mirros contains newer version (netaddr 0.7.14) + + -- Ivan Berezovskiy Mon, 06 Apr 2015 17:01:19 +0300 + ceilometer (2014.2.2-fuel6.1-14.04-2) trusty; urgency=medium * Sync requirements with global diff --git a/trusty/debian/patches/fix-requirements.patch b/trusty/debian/patches/fix-requirements.patch index c4d8ae0..5cad233 100644 --- a/trusty/debian/patches/fix-requirements.patch +++ b/trusty/debian/patches/fix-requirements.patch @@ -10,11 +10,13 @@ index 758818e..8839b31 100644 croniter>=0.3.4,<=0.3.5 # MIT License eventlet>=0.15.1,<=0.15.2 happybase>=0.5,!=0.7,<=0.9 -@@ -16,7 +15,6 @@ lockfile>=0.8,<=0.8 +@@ -15,8 +14,7 @@ keystonemiddleware>=1.0.0,<1.4.0 + lockfile>=0.8,<=0.8 lxml>=2.3,<=3.3.3 msgpack-python>=0.4.0,<=0.4.5 - netaddr>=0.7.12,<=0.7.13 +-netaddr>=0.7.12,<=0.7.13 -ordereddict<=1.1 ++netaddr>=0.7.12 oslo.db>=1.0.0,<1.1 # Apache-2.0 oslo.config>=1.4.0,<=1.6.0 # Apache-2.0 oslo.rootwrap>=1.3.0,<=1.5.0 -- 2.32.3