From: Thomas Goirand Date: Fri, 25 Sep 2015 08:00:17 +0000 (+0200) Subject: Merge tag '7.0.0_rc1' into debian/liberty X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=713ea0aceaa4b3d18e8249122e6c755bf6a3999d;p=openstack-build%2Fcinder-build.git Merge tag '7.0.0_rc1' into debian/liberty Cinder liberty-rc1 milestone (7.0.0.0rc1) Conflicts: cinder/volume/drivers/zfssa/zfssaiscsi.py --- 713ea0aceaa4b3d18e8249122e6c755bf6a3999d