diff options
| author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2015-03-10 14:01:12 -0400 |
|---|---|---|
| committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2015-03-10 14:01:12 -0400 |
| commit | 4c76538c253e359892a134e53a29875f4c43f8e4 (patch) | |
| tree | 6e625274dbfac874ebe477d31db9cddc4f65534a /meta-openstack/recipes-devtools/python/python-ceilometer_git.bb | |
| parent | cf2f9f46e5c6ec222f577d8344d69b7a8390c84e (diff) | |
| parent | 825048fe5ef82644ae5bb2833e71b295e759d7e1 (diff) | |
| download | meta-cloud-services-4c76538c253e359892a134e53a29875f4c43f8e4.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 5c6fbbb..e734d32 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=stable/juno \ | 10 | SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \ |
| 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=stable/juno \ | |||
| 16 | # file://ceilometer-builtin-tests-config-location.patch | 16 | # file://ceilometer-builtin-tests-config-location.patch |
| 17 | 17 | ||
| 18 | 18 | ||
| 19 | SRCREV="b1fca33e5f4c5443389d131a212a058d2306ac23" | 19 | SRCREV="b2871217fec965c77581b0f4a33608dad7867d4b" |
| 20 | PV="2014.2+git${SRCPV}" | 20 | PV="2015.1.0b2+git${SRCPV}" |
| 21 | S = "${WORKDIR}/git" | 21 | S = "${WORKDIR}/git" |
| 22 | 22 | ||
| 23 | CEILOMETER_SECRET ?= "12121212" | 23 | CEILOMETER_SECRET ?= "12121212" |