]> review.fuel-infra Code Review - openstack-build/cinder-build.git/commit
Merge tag '2013.1_g2' into debian/grizzly
authorThomas Goirand <thomas@goirand.fr>
Mon, 28 Jan 2013 07:53:55 +0000 (15:53 +0800)
committerThomas Goirand <thomas@goirand.fr>
Mon, 28 Jan 2013 07:53:55 +0000 (15:53 +0800)
commitaec45151fbe6ba5a6f3398307f50a15a47a8a2d5
tree7e8f526edb97c8304a26e025cd3aa1579c84e723
parent18174eba4052631ef9af2280873f90a1e522a8ea
parent141a4cab68cae6eef7f3fcc22b40e6c708e19126
Merge tag '2013.1_g2' into debian/grizzly

grizzly-2

Conflicts:
cinder/volume/san.py
cinder/tests/api/v1/test_snapshots.py
cinder/version.py