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-ceilometer_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-ceilometer_git.bb')
| -rw-r--r-- | meta-openstack/recipes-devtools/python/python-ceilometer_git.bb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb b/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb index b5f0e22..3860ca5 100644 --- a/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb +++ b/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb | |||
| @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2" | |||
| 7 | PR = "r0" | 7 | PR = "r0" |
| 8 | SRCNAME = "ceilometer" | 8 | SRCNAME = "ceilometer" |
| 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://ceilometer.conf \ | 11 | file://ceilometer.conf \ |
| 12 | file://ceilometer.init \ | 12 | file://ceilometer.init \ |
| 13 | file://fix_ceilometer_memory_leak.patch \ | 13 | file://fix_ceilometer_memory_leak.patch \ |
| @@ -16,8 +16,8 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \ | |||
| 16 | # file://ceilometer-builtin-tests-config-location.patch | 16 | # file://ceilometer-builtin-tests-config-location.patch |
| 17 | 17 | ||
| 18 | 18 | ||
| 19 | SRCREV = "348ecb0861637da5575b094f8fa3fab1e3770928" | 19 | SRCREV = "b0447ed8e7bee371bf7095c86e47d717abe89edc" |
| 20 | PV = "2015.1.0b3+git${SRCPV}" | 20 | PV = "2015.1.0+git${SRCPV}" |
| 21 | S = "${WORKDIR}/git" | 21 | S = "${WORKDIR}/git" |
| 22 | 22 | ||
| 23 | CEILOMETER_SECRET ?= "12121212" | 23 | CEILOMETER_SECRET ?= "12121212" |