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=5101daa6d20bd0d9ad3e1653690990c115539ccc;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
---

5101daa6d20bd0d9ad3e1653690990c115539ccc
diff --cc debian/gbp.conf
index 7da944a9d,000000000..c737cbbfb
mode 100644,000000..100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@@ -1,8 -1,0 +1,8 @@@
 +[DEFAULT]
 +upstream-branch = master
- debian-branch = debian/liberty
++debian-branch = debian/mitaka
 +upstream-tag = %(version)s
 +compression = xz
 +
 +[buildpackage]
 +export-dir = ../build-area/