]> review.fuel-infra Code Review - openstack-build/cinder-build.git/commitdiff
Code Review / openstack-build / cinder-build.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | combined (merge: 08606f9 6dba657)
Merge tag '7.0.0_b3' into debian/liberty
authorThomas Goirand <zigo@debian.org>
Mon, 7 Sep 2015 10:07:24 +0000 (12:07 +0200)
committerThomas Goirand <zigo@debian.org>
Mon, 7 Sep 2015 10:07:24 +0000 (12:07 +0200)
Cinder liberty-3 milestone (7.0.0.0b3)

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


Trivial merge