]> 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: 3ec0dba caacf04)
Merge tag '7.0.0_b2' into debian/liberty
authorThomas Goirand <zigo@debian.org>
Sat, 1 Aug 2015 15:26:52 +0000 (17:26 +0200)
committerThomas Goirand <zigo@debian.org>
Sat, 1 Aug 2015 15:26:52 +0000 (17:26 +0200)
Cinder liberty-2 milestone (7.0.0.0b2)

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


Trivial merge