From ff1617656120ec0f9844c58266716d8c2fb8d87f Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Mon, 7 Dec 2015 14:05:19 +0100 Subject: [PATCH] Merge tag '8.0.0_b1' into debian/mitaka 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 --- trusty/debian/gbp.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/trusty/debian/gbp.conf b/trusty/debian/gbp.conf index 7da944a9d..c737cbbfb 100644 --- a/trusty/debian/gbp.conf +++ b/trusty/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 -- 2.45.2