summaryrefslogtreecommitdiffstats
path: root/meta-openstack/conf/layer.conf
diff options
context:
space:
mode:
authorMark Asselstine <mark.asselstine@windriver.com>2015-12-09 11:44:21 -0500
committerBruce Ashfield <bruce.ashfield@windriver.com>2015-12-11 12:17:24 -0500
commit18f6951ff709cc78c5519c0a593e39cf8c09f331 (patch)
tree9a11af79c375235b4376019cbac47d96f1c12af7 /meta-openstack/conf/layer.conf
parent2d260e08c1e1b4f115b226fdcaf02eb9e7dce77f (diff)
downloadmeta-cloud-services-18f6951ff709cc78c5519c0a593e39cf8c09f331.tar.gz
python-django: uprev to 1.8.6
Move to use git to ease future uprevs. Note that a recipe for django exists in meta-python and since it is a versioned recipe instead of a "_git" recipe it seems to be picked up instead of our recipe, so we need to add a PREFERRED_VERSION to ensure our recipe is used. Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'meta-openstack/conf/layer.conf')
-rw-r--r--meta-openstack/conf/layer.conf1
1 files changed, 1 insertions, 0 deletions
diff --git a/meta-openstack/conf/layer.conf b/meta-openstack/conf/layer.conf
index 2b3a00d..f0d42b8 100644
--- a/meta-openstack/conf/layer.conf
+++ b/meta-openstack/conf/layer.conf
@@ -14,3 +14,4 @@ BB_DANGLINGAPPENDS_WARNONLY ?= "true"
14PREFERRED_VERSION_python-greenlet = "0.4.1" 14PREFERRED_VERSION_python-greenlet = "0.4.1"
15PREFERRED_VERSION_python-sqlalchemy = "0.9.7" 15PREFERRED_VERSION_python-sqlalchemy = "0.9.7"
16PREFERRED_VERSION_python-pexpect = "3.3" 16PREFERRED_VERSION_python-pexpect = "3.3"
17PREFERRED_VERSION_python-django = "1.8.6"