Rebase for "Improve reliability of upload_cirros" 81/15481/1
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Mon, 13 Jun 2016 19:04:24 +0000 (21:04 +0200)
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Mon, 13 Jun 2016 19:11:22 +0000 (21:11 +0200)
commite3ca391c5de55239b4af8a688ff419bb13457124
tree754567832e1565c82bf36613806ce0a393cbb7ad
parent5923831d4c9edda72ce6c0c4778d11f37d6f60f6
Rebase for "Improve reliability of upload_cirros"

Upstream change "Improve reliability of upload_cirros.rb" [1]
allows us to drop the "Increase upload_cirros timeout" patch,
and also requires rebasing our direct kernel boot patch.

Also squashed in a small context edit for an unrelated patch.

[1] https://review.openstack.org/#/c/327792/

Change-Id: I8adc30a74714414fae55bc7b81bc0f69f41735ce
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
patches/fuel-library/0006-upload_cirros-Add-direct-kernel-boot-support.patch [moved from patches/fuel-library/0006-direct-kernel-boot-for-cirros.patch with 67% similarity]
patches/fuel-library/0008-Increase-upload_cirros-timeout-for-multi-image.patch [deleted file]
patches/fuel-library/0013-Allow-configuring-MySQL-WSREP-SST-provider.patch