summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2015-05-20 08:16:22 -0400
committerBruce Ashfield <bruce.ashfield@windriver.com>2015-05-20 08:16:22 -0400
commitc5feedcbab087538da2dea0cf0f32db5b1efa5df (patch)
tree3a0d11601973b5d04380931fcd6e3f17561d1b6e
parentab3432d7ff4ea9b7fd3dd4e04376d2b67e467eb6 (diff)
parent71b7ba7724a8d4a59a46de1828894176ff985020 (diff)
downloadmeta-cloud-services-c5feedcbab087538da2dea0cf0f32db5b1efa5df.tar.gz
Merge branch 'master' into kilo
-rw-r--r--meta-openstack/recipes-devtools/python/python-keystoneclient_git.bb1
-rw-r--r--meta-openstack/recipes-devtools/python/python-nova_git.bb3
2 files changed, 4 insertions, 0 deletions
diff --git a/meta-openstack/recipes-devtools/python/python-keystoneclient_git.bb b/meta-openstack/recipes-devtools/python/python-keystoneclient_git.bb
index 0063efc..383163d 100644
--- a/meta-openstack/recipes-devtools/python/python-keystoneclient_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-keystoneclient_git.bb
@@ -32,6 +32,7 @@ RDEPENDS_${PN} += " \
32 python-requests \ 32 python-requests \
33 python-simplejson \ 33 python-simplejson \
34 python-oslo.config \ 34 python-oslo.config \
35 python-oslo.serialization \
35 python-pbr \ 36 python-pbr \
36 " 37 "
37 38
diff --git a/meta-openstack/recipes-devtools/python/python-nova_git.bb b/meta-openstack/recipes-devtools/python/python-nova_git.bb
index 4e96341..423b0c3 100644
--- a/meta-openstack/recipes-devtools/python/python-nova_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-nova_git.bb
@@ -274,6 +274,7 @@ RDEPENDS_${PN} = " libvirt \
274 python-keystonemiddleware \ 274 python-keystonemiddleware \
275 python-modules \ 275 python-modules \
276 python-misc \ 276 python-misc \
277 python-amqp \
277 python-amqplib \ 278 python-amqplib \
278 python-anyjson \ 279 python-anyjson \
279 python-babel \ 280 python-babel \
@@ -297,9 +298,11 @@ RDEPENDS_${PN} = " libvirt \
297 python-oslo.concurrency \ 298 python-oslo.concurrency \
298 python-oslo.middleware \ 299 python-oslo.middleware \
299 python-oslo.context \ 300 python-oslo.context \
301 python-oslo.log \
300 python-paste \ 302 python-paste \
301 python-pastedeploy \ 303 python-pastedeploy \
302 python-paramiko \ 304 python-paramiko \
305 python-psutil \
303 python-pyasn1 \ 306 python-pyasn1 \
304 python-setuptools-git \ 307 python-setuptools-git \
305 python-simplejson \ 308 python-simplejson \