]> review.fuel-infra Code Review - openstack-build/cinder-build.git/commitdiff
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

1  2 
debian/gbp.conf

diff --cc debian/gbp.conf
index 7da944a9d0264f223053c1bd3ae0723caa42b81f,0000000000000000000000000000000000000000..c737cbbfb6d7a8df6ccb41a5d9bf6f3397635a49
mode 100644,000000..100644
--- /dev/null
@@@ -1,8 -1,0 +1,8 @@@
- debian-branch = debian/liberty
 +[DEFAULT]
 +upstream-branch = master
++debian-branch = debian/mitaka
 +upstream-tag = %(version)s
 +compression = xz
 +
 +[buildpackage]
 +export-dir = ../build-area/