Code Review / openstack-build / cinder-build.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | combined (merge: 8961cd1 2445196)
Merge tag '7.0.0_rc1' into debian/liberty
authorThomas Goirand <zigo@debian.org>
Fri, 25 Sep 2015 08:00:17 +0000 (10:00 +0200)
committerThomas Goirand <zigo@debian.org>
Fri, 25 Sep 2015 08:00:17 +0000 (10:00 +0200)
Cinder liberty-rc1 milestone (7.0.0.0rc1)

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


Trivial merge