]> review.fuel-infra Code Review - openstack-build/cinder-build.git/commitdiff
Code Review / openstack-build / cinder-build.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: dcdcab6)
Merge tag '8.0.0_b1' into debian/mitaka
authorThomas Goirand <zigo@debian.org>
Mon, 7 Dec 2015 13:05:19 +0000 (14:05 +0100)
committerThomas Goirand <zigo@debian.org>
Mon, 7 Dec 2015 13:05:19 +0000 (14:05 +0100)
cinder 8.0.0.0b1 development milestone

meta:version: 8.0.0.0b1
meta:series: mitaka
meta:release-type: development milestone

Conflicts:
cinder/volume/drivers/zfssa/zfssaiscsi.py

Rewritten-From: 5101daa6d20bd0d9ad3e1653690990c115539ccc

xenial/debian/gbp.conf patch | blob | history

diff --git a/xenial/debian/gbp.conf b/xenial/debian/gbp.conf
index 7da944a9d0264f223053c1bd3ae0723caa42b81f..c737cbbfb6d7a8df6ccb41a5d9bf6f3397635a49 100644 (file)
--- a/xenial/debian/gbp.conf
+++ b/xenial/debian/gbp.conf
@@ -1,6 +1,6 @@
 [DEFAULT]
 upstream-branch = master
-debian-branch = debian/liberty
+debian-branch = debian/mitaka
 upstream-tag = %(version)s
 compression = xz