]> review.fuel-infra Code Review - openstack-build/cinder-build.git/commit
Merge tag '2015.1_b1' into debian/kilo
authorThomas Goirand <thomas@goirand.fr>
Tue, 23 Dec 2014 07:22:54 +0000 (15:22 +0800)
committerThomas Goirand <thomas@goirand.fr>
Tue, 23 Dec 2014 07:22:54 +0000 (15:22 +0800)
commitc1f34ee2fbd0df6c184ed7aca6301a77ede9f46e
tree932097072fde31b1a90f8dcc9a3ad8ebebf5fc00
parentab87aae37902f35a29544e05a1988693dbb624f8
parentf87300b96ada74d68e7075b498ca44d8dade597d
Merge tag '2015.1_b1' into debian/kilo

Cinder kilo-1 milestone (2015.1.0b1)

Conflicts:
cinder/openstack/common/processutils.py
cinder/tests/volume/drivers/netapp/test_iscsi.py
cinder/volume/drivers/netapp/iscsi.py
cinder/volume/drivers/netapp/nfs.py
etc/cinder/cinder.conf.sample
cinder/brick/iscsi/iscsi.py
cinder/locale/cinder.pot
cinder/tests/brick/test_brick_connector.py