]> review.fuel-infra Code Review - openstack-build/cinder-build.git/commit
Merge tag '2013.2_b1' into debian/havana
authorThomas Goirand <thomas@goirand.fr>
Sat, 29 Jun 2013 04:39:27 +0000 (12:39 +0800)
committerThomas Goirand <thomas@goirand.fr>
Sat, 29 Jun 2013 04:39:27 +0000 (12:39 +0800)
commit896537795b3c3e1daeeaf81c40793f27003ddd90
tree197664ab4bd3283f648456469d4767719db812c6
parent2964c85c5d4eaac994058bb5f176186a3a964496
parentb2371aeff9eccbd28952dd0f568da26722dc58f7
Merge tag '2013.2_b1' into debian/havana

Cinder havana-1 milestone (2013.2.b1)

Conflicts:
cinder/openstack/common/setup.py
cinder/openstack/common/version.py
tools/flakes.py
cinder/tests/test_netapp.py
cinder/tests/test_nfs.py
cinder/volume/drivers/san/hp/hp_3par_common.py
cinder/volume/manager.py