1 files changed, 60 insertions, 61 deletions

diff --git a/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb b/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb
index 5645626..1c29f28 100644
--- a/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb
@@ -6,17 +6,16 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
 
 SRCNAME = "ceilometer"
 
-SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \
+SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/newton \
            file://ceilometer.conf \
            file://ceilometer.init \
-           file://fix_ceilometer_memory_leak.patch \
 "
 # dropped for juno:
 #   file://ceilometer-builtin-tests-config-location.patch
 
 
-SRCREV = "026a5d475e1958bf761e41c2bb426b09e0f3d270"
-PV = "5.0.0+git${SRCPV}"
+SRCREV = "327648f0d24c9f8326057175db6f1634389a1775"
+PV = "7.1.0+git${SRCPV}"
 S = "${WORKDIR}/git"
 
 CEILOMETER_SECRET ?= "12121212"
@@ -181,78 +180,78 @@ DEPENDS += " \
         "
 
 RDEPENDS_${PN} += " \
-        python-ply \
-        python-jsonpath-rw \
-        python-sqlalchemy \
-        python-amqplib \
-        python-anyjson \
-        python-eventlet \
-        python-kombu \
-        python-lxml \
-        python-routes \
-        python-webob \
-        python-greenlet \
-        python-lockfile \
-        python-pastedeploy \
-        python-paste \
-        python-sqlalchemy-migrate \
-        python-stevedore \
-        python-suds-jurko \
-        python-paramiko \
-        python-babel \
-        python-iso8601 \
-        python-setuptools-git \
-        python-glanceclient \
-        python-keystoneclient \
-        python-swiftclient \
-        python-ceilometerclient \
-        python-oslo.config \
-        python-oslo.serialization \
-        python-oslo.rootwrap \
-        python-tooz \        
-        python-msgpack \
-        python-pecan \
-        python-amqp \
-        python-singledispatch \
-        python-flask \
-        python-werkzeug \
-        python-itsdangerous \
-        python-happybase \
-        python-wsme \
-        python-eventlet \
-        python-pymongo \
-        python-thrift \
-        python-simplegeneric \
-        python-webtest \
-        python-waitress \
-        python-pyyaml \
-        python-pip \
-        python-pytz \
-        python-pbr \
-        python-croniter \
-        python-ipaddr \
-        python-pysnmp \
-        python-retrying \
+        python-amqp \
+        python-amqplib \
+        python-anyjson \
+        python-babel \
+        python-ceilometerclient \
+        python-cotyledon \
+        python-croniter \
+        python-dateutil \
+        python-eventlet \
+        python-flask \
+        python-glanceclient \
+        python-greenlet \
+        python-happybase \
+        python-ipaddr \
+        python-iso8601 \
+        python-itsdangerous \
+        python-jsonpath-rw \
         python-jsonpath-rw-ext \
         python-jsonschema \
         python-kafka \
+        python-keystoneclient \
         python-keystonemiddleware \
+        python-kombu \
+        python-lockfile \
+        python-lxml \
+        python-msgpack \
+        python-neutronclient \
+        python-novaclient \
+        python-oslo.concurrency \
+        python-oslo.config \
         python-oslo.context \
         python-oslo.db \
-        python-oslo.concurrency \
         python-oslo.i18n \
         python-oslo.log \
+        python-oslo.messaging \
+        python-oslo.middleware \
         python-oslo.policy \
         python-oslo.reports \
+        python-oslo.rootwrap \
+        python-oslo.serialization \
         python-oslo.service \
-        python-oslo.messaging \
-        python-oslo.middleware \
         python-oslo.utils \
-        python-neutronclient \
-        python-novaclient \
+        python-paramiko \
+        python-paste \
+        python-pastedeploy \
+        python-pbr \
+        python-pecan \
+        python-pip \
+        python-ply \
+        python-pymongo \
+        python-pysnmp \
+        python-pytz \
+        python-pyyaml \
         python-requests \
+        python-retrying \
+        python-routes \
+        python-setuptools-git \
+        python-simplegeneric \
+        python-singledispatch \
         python-six \
+        python-sqlalchemy \
+        python-sqlalchemy-migrate \
+        python-stevedore \
+        python-suds-jurko \
+        python-swiftclient \
+        python-thrift \
         python-tooz \
+        python-waitress \
+        python-webob \
+        python-webtest \
+        python-werkzeug \
+        python-wsme \
         "
 
 RDEPENDS_${SRCNAME}-controller = "${PN} ${SRCNAME}-common ${SRCNAME}-alarm-notifier ${SRCNAME}-alarm-evaluator ${SRCNAME}-agent-notification ${SRCNAME}-reseller \