From: Thomas Goirand <zigo@debian.org>
Date: Sat, 1 Aug 2015 15:26:52 +0000 (+0200)
Subject: Merge tag '7.0.0_b2' into debian/liberty
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=54cb89cd74bc059840e73c6c7db33b4ccf1f0ddf;p=openstack-build%2Fcinder-build.git

Merge tag '7.0.0_b2' into debian/liberty

Cinder liberty-2 milestone (7.0.0.0b2)

Conflicts:
	cinder/volume/drivers/zfssa/zfssaiscsi.py
---

54cb89cd74bc059840e73c6c7db33b4ccf1f0ddf