summaryrefslogtreecommitdiffstats
path: root/meta-openstack/recipes-devtools/python/python-barbican_git.bb
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2015-05-07 14:13:43 -0400
committerBruce Ashfield <bruce.ashfield@windriver.com>2015-05-07 14:13:43 -0400
commitccff64bdb16ff222d13cc3a61d6c6dbd30ea50f3 (patch)
tree25fed01879228603672beb26e882b5681d4c8096 /meta-openstack/recipes-devtools/python/python-barbican_git.bb
parentca8b06893b0d584a0b5f15dd66b14da4f18100bc (diff)
parentdd04ca6db2993404284679ea04a80d9071f90c2b (diff)
downloadmeta-cloud-services-ccff64bdb16ff222d13cc3a61d6c6dbd30ea50f3.tar.gz
Merge branch 'master' into kilo
Diffstat (limited to 'meta-openstack/recipes-devtools/python/python-barbican_git.bb')
-rw-r--r--meta-openstack/recipes-devtools/python/python-barbican_git.bb6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta-openstack/recipes-devtools/python/python-barbican_git.bb b/meta-openstack/recipes-devtools/python/python-barbican_git.bb
index 24557ad..15459f1 100644
--- a/meta-openstack/recipes-devtools/python/python-barbican_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-barbican_git.bb
@@ -8,15 +8,15 @@ PR = "r0"
8SRCNAME = "barbican" 8SRCNAME = "barbican"
9BARBICAN_MAX_PACKET_SIZE ?= "65535" 9BARBICAN_MAX_PACKET_SIZE ?= "65535"
10 10
11SRC_URI = "git://github.com/openstack/barbican.git;branch=master \ 11SRC_URI = "git://github.com/openstack/barbican.git;branch=stable/kilo \
12 file://barbican.init \ 12 file://barbican.init \
13 file://barbican-increase-buffer-size-to-support-PKI-tokens.patch \ 13 file://barbican-increase-buffer-size-to-support-PKI-tokens.patch \
14 file://barbican-fix-path-to-find-configuration-files.patch \ 14 file://barbican-fix-path-to-find-configuration-files.patch \
15 file://barbican-handle-white-space-in-date-strings.patch \ 15 file://barbican-handle-white-space-in-date-strings.patch \
16 " 16 "
17 17
18SRCREV = "12966ea7ad40622e4189d832d13f4d9bfb9f3ada" 18SRCREV = "e6f05febbe18a86e4e6b05acc5f4868fa3beb291"
19PV = "2015.1.0b3+git${SRCPV}" 19PV = "2015.1.0+git${SRCPV}"
20S = "${WORKDIR}/git" 20S = "${WORKDIR}/git"
21 21
22inherit update-rc.d setuptools identity hosts useradd default_configs openstackchef monitor 22inherit update-rc.d setuptools identity hosts useradd default_configs openstackchef monitor