summaryrefslogtreecommitdiffstats
path: root/meta-openstack/conf
diff options
context:
space:
mode:
authorMark Asselstine <mark.asselstine@windriver.com>2018-04-04 16:03:39 -0400
committerBruce Ashfield <bruce.ashfield@windriver.com>2018-04-09 10:48:37 -0400
commit7d68719268bc895ca7665007ad6f670389df1415 (patch)
treef8a0994a1acd35fd781774a83cdc0fa7fac3f151 /meta-openstack/conf
parent1971da9c1e7768aa3cc49b40fa4175b9895799fd (diff)
downloadmeta-cloud-services-7d68719268bc895ca7665007ad6f670389df1415.tar.gz
python-oslo.i18n: was uprev'd incorrectly
The original commit had a mistake in it giving the impression 3.20.0 was on the stable/pike branch when in fact it was not. We want all openstack components on stable/pike so this uprev is not valid and we must bring back the old version and set it as the PREFERRED_VERSION. Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'meta-openstack/conf')
-rw-r--r--meta-openstack/conf/layer.conf2
1 files changed, 2 insertions, 0 deletions
diff --git a/meta-openstack/conf/layer.conf b/meta-openstack/conf/layer.conf
index c5884c5..2565b92 100644
--- a/meta-openstack/conf/layer.conf
+++ b/meta-openstack/conf/layer.conf
@@ -23,4 +23,6 @@ PREFERRED_VERSION_python-eventlet = "0.20.0"
23PREFERRED_VERSION_python-warlock = "1.2.0" 23PREFERRED_VERSION_python-warlock = "1.2.0"
24PREFERRED_VERSION_python-jsonschema = "2.6.0" 24PREFERRED_VERSION_python-jsonschema = "2.6.0"
25PREFERRED_VERSION_python-networkx = "1.11" 25PREFERRED_VERSION_python-networkx = "1.11"
26PREFERRED_VERSION_python-oslo.i18n = "3.17.0+gitAUTOINC+f2729cd36f"
27
26LICENSE_PATH += "${LAYERDIR}/licenses" 28LICENSE_PATH += "${LAYERDIR}/licenses"