From: Thomas Goirand Date: Mon, 7 Sep 2015 10:07:24 +0000 (+0200) Subject: Merge tag '7.0.0_b3' into debian/liberty X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=6666471c6a715dcc80782caff8e28c5e72fbe2d0;p=openstack-build%2Fcinder-build.git Merge tag '7.0.0_b3' into debian/liberty Cinder liberty-3 milestone (7.0.0.0b3) Conflicts: cinder/volume/drivers/zfssa/zfssaiscsi.py --- 6666471c6a715dcc80782caff8e28c5e72fbe2d0