summaryrefslogtreecommitdiffstats
path: root/meta-openstack/recipes-devtools/python/python-heat_git.bb
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2015-05-07 14:13:43 -0400
committerBruce Ashfield <bruce.ashfield@windriver.com>2015-05-07 14:13:43 -0400
commitccff64bdb16ff222d13cc3a61d6c6dbd30ea50f3 (patch)
tree25fed01879228603672beb26e882b5681d4c8096 /meta-openstack/recipes-devtools/python/python-heat_git.bb
parentca8b06893b0d584a0b5f15dd66b14da4f18100bc (diff)
parentdd04ca6db2993404284679ea04a80d9071f90c2b (diff)
downloadmeta-cloud-services-ccff64bdb16ff222d13cc3a61d6c6dbd30ea50f3.tar.gz
Merge branch 'master' into kilo
Diffstat (limited to 'meta-openstack/recipes-devtools/python/python-heat_git.bb')
-rw-r--r--meta-openstack/recipes-devtools/python/python-heat_git.bb6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta-openstack/recipes-devtools/python/python-heat_git.bb b/meta-openstack/recipes-devtools/python/python-heat_git.bb
index 7750c93..7abb4d0 100644
--- a/meta-openstack/recipes-devtools/python/python-heat_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-heat_git.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
7PR = "r0" 7PR = "r0"
8SRCNAME = "heat" 8SRCNAME = "heat"
9 9
10SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \ 10SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/kilo \
11 file://heat.conf \ 11 file://heat.conf \
12 file://heat.init \ 12 file://heat.init \
13 file://autoscaling_example.template \ 13 file://autoscaling_example.template \
@@ -16,8 +16,8 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \
16 file://heat-tests-change-project_dir-path.patch \ 16 file://heat-tests-change-project_dir-path.patch \
17" 17"
18 18
19SRCREV = "34cc6d7e96e1a54dce5c91cc09583e08f2fa778e" 19SRCREV = "6db88597dba0b79b2501f43b704c93b2728a5ec6"
20PV = "2015.1.0b3+git${SRCPV}" 20PV = "2015.1.0+git${SRCPV}"
21S = "${WORKDIR}/git" 21S = "${WORKDIR}/git"
22 22
23SERVICECREATE_PACKAGES = "${SRCNAME}-setup ${SRCNAME}-templates ${SRCNAME}-cfn" 23SERVICECREATE_PACKAGES = "${SRCNAME}-setup ${SRCNAME}-templates ${SRCNAME}-cfn"