Merge tag '7.0.0_b1' into debian/liberty

Cinder liberty-1 milestone (7.0.0.0b1)

Conflicts:
	cinder/tests/volume/drivers/netapp/dataontap/test_nfs_base.py
	cinder/tests/volume/drivers/netapp/dataontap/test_nfs_cmode.py
	cinder/volume/drivers/zfssa/zfssaiscsi.py

Rewritten-From: e64227d1d622dfc52f3dbd8f55fe3da505b84d4b

diff --git a/xenial/debian/changelog b/xenial/debian/changelog
index f1e7d4a6d1bfcd78f173140d454d7038f1b0ad5a..254719b5b24d2677d402a9e0b457a0f58ee5cdec 100644 (file)
--- a/xenial/debian/changelog
+++ b/xenial/debian/changelog
@@ -1,3 +1,9 @@
+cinder (1:7.0.0~b1-1) experimental; urgency=medium
+
+  * New upstream release.
+
+ -- Thomas Goirand <zigo@debian.org>  Fri, 10 Jul 2015 09:41:59 +0200
+
 cinder (2015.1.0+2015.06.16.git26.9634b76ba5-3) unstable; urgency=medium
 
   * Rebuilt for sqlalchemy 1.0.6.