From: Thomas Goirand <zigo@debian.org>
Date: Mon, 7 Dec 2015 13:05:19 +0000 (+0100)
Subject: Merge tag '8.0.0_b1' into debian/mitaka
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=ff1617656120ec0f9844c58266716d8c2fb8d87f;p=openstack-build%2Fcinder-build.git

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
---

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