aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosep Puigdemont <josep.puigdemont@enea.com>2015-12-08 18:33:49 +0100
committerBruce Ashfield <bruce.ashfield@windriver.com>2015-12-11 12:11:29 -0500
commit6ff78ac75b011eed5cdfef00b43bd3895f7f70ed (patch)
tree15ac58dd8b1dd775f3d11937f5e51f12d1fb9aa4
parentb540b1b9f3b6586fe15015f2f72ea8d03d96a038 (diff)
downloadmeta-cloud-services-6ff78ac75b011eed5cdfef00b43bd3895f7f70ed.tar.gz
meta-cloud-services-6ff78ac75b011eed5cdfef00b43bd3895f7f70ed.tar.bz2
meta-cloud-services-6ff78ac75b011eed5cdfef00b43bd3895f7f70ed.zip
python-ceilometer: upgrade to 2015.1.2
Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
-rw-r--r--meta-openstack/recipes-devtools/python/python-ceilometer_git.bb7
1 files changed, 3 insertions, 4 deletions
diff --git a/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb b/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb
index c3a69ee9..0a19370a 100644
--- a/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb
@@ -4,10 +4,9 @@ SECTION = "devel/python"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
-PR = "r0"
SRCNAME = "ceilometer"
-SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \
+SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/kilo \
file://ceilometer.conf \
file://ceilometer.init \
file://fix_ceilometer_memory_leak.patch \
@@ -16,8 +15,8 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \
# file://ceilometer-builtin-tests-config-location.patch
-SRCREV="b2871217fec965c77581b0f4a33608dad7867d4b"
-PV="2015.1.0b2+git${SRCPV}"
+SRCREV="06b9b908406e078bdbff2aa7e18d19f55ef31037"
+PV="2015.1.2+git${SRCPV}"
S = "${WORKDIR}/git"
CEILOMETER_SECRET ?= "12121212"