aboutsummaryrefslogtreecommitdiffstats
path: root/meta-openstack/recipes-devtools/python/python-nova_git.bb
diff options
context:
space:
mode:
Diffstat (limited to 'meta-openstack/recipes-devtools/python/python-nova_git.bb')
-rw-r--r--meta-openstack/recipes-devtools/python/python-nova_git.bb7
1 files changed, 4 insertions, 3 deletions
diff --git a/meta-openstack/recipes-devtools/python/python-nova_git.bb b/meta-openstack/recipes-devtools/python/python-nova_git.bb
index 929adff5..6afe3bd5 100644
--- a/meta-openstack/recipes-devtools/python/python-nova_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-nova_git.bb
@@ -11,14 +11,15 @@ SRCNAME = "nova"
FILESEXTRAPATHS_append := "${THISDIR}/${PN}"
-SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \
+SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/juno \
file://nova-add-migrate.cfg-to-the-MANIFEST.patch \
file://nova-convert-path-from-relative-to-absolute.patch \
file://nova-fix-location-to-doc-directory.patch \
file://nova-fix-location-to-plugin-directory.patch \
file://neutron-api-set-default-binding-vnic_type.patch \
- file://websocketproxy-allow-empty-schemes-at-python-2.7.3.patch \
"
+# restore post stable/juno:
+# file://websocketproxy-allow-empty-schemes-at-python-2.7.3.patch
SRC_URI += "file://nova-all \
file://nova.init \
@@ -26,7 +27,7 @@ SRC_URI += "file://nova-all \
file://nova.conf \
file://openrc \
"
-SRCREV="943f02f1a62f7eb131f62729d83d97ad431ee89f"
+SRCREV="9c3ec16576e2f7c9d5aff6e4b620d708e6636568"
PV="2014.2+git${SRCPV}"
S = "${WORKDIR}/git"