diff options
| author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2015-05-07 14:13:43 -0400 |
|---|---|---|
| committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2015-05-07 14:13:43 -0400 |
| commit | ccff64bdb16ff222d13cc3a61d6c6dbd30ea50f3 (patch) | |
| tree | 25fed01879228603672beb26e882b5681d4c8096 /meta-openstack/recipes-devtools/python/python-cinder_git.bb | |
| parent | ca8b06893b0d584a0b5f15dd66b14da4f18100bc (diff) | |
| parent | dd04ca6db2993404284679ea04a80d9071f90c2b (diff) | |
| download | meta-cloud-services-ccff64bdb16ff222d13cc3a61d6c6dbd30ea50f3.tar.gz | |
Merge branch 'master' into kilo
Diffstat (limited to 'meta-openstack/recipes-devtools/python/python-cinder_git.bb')
| -rw-r--r-- | meta-openstack/recipes-devtools/python/python-cinder_git.bb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta-openstack/recipes-devtools/python/python-cinder_git.bb b/meta-openstack/recipes-devtools/python/python-cinder_git.bb index 9276d1f..ceb17d8 100644 --- a/meta-openstack/recipes-devtools/python/python-cinder_git.bb +++ b/meta-openstack/recipes-devtools/python/python-cinder_git.bb | |||
| @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2" | |||
| 7 | PR = "r0" | 7 | PR = "r0" |
| 8 | SRCNAME = "cinder" | 8 | SRCNAME = "cinder" |
| 9 | 9 | ||
| 10 | SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \ | 10 | SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/kilo \ |
| 11 | file://cinder.conf \ | 11 | file://cinder.conf \ |
| 12 | file://cinder.init \ | 12 | file://cinder.init \ |
| 13 | file://cinder-volume \ | 13 | file://cinder-volume \ |
| @@ -21,8 +21,8 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \ | |||
| 21 | # file://0001-run_tests-respect-tools-dir.patch | 21 | # file://0001-run_tests-respect-tools-dir.patch |
| 22 | # file://fix_cinder_memory_leak.patch | 22 | # file://fix_cinder_memory_leak.patch |
| 23 | 23 | ||
| 24 | SRCREV="f4f46e972004eca66e4751a836156c342e448621" | 24 | SRCREV = "5987bb2290f629e59b0bcced2f8fe22cdeb9cc6d" |
| 25 | PV="2015.1.0b2+git${SRCPV}" | 25 | PV = "2015.1.0+git${SRCPV}" |
| 26 | S = "${WORKDIR}/git" | 26 | S = "${WORKDIR}/git" |
| 27 | 27 | ||
| 28 | inherit setuptools update-rc.d identity default_configs hosts openstackchef monitor | 28 | inherit setuptools update-rc.d identity default_configs hosts openstackchef monitor |