Merge lp://qastaging/~harlowja/cloud-init/url-ssl-fixings into lp://qastaging/~cloud-init-dev/cloud-init/trunk
Proposed by
Joshua Harlow
Status: | Merged | ||||
---|---|---|---|---|---|
Merged at revision: | 801 | ||||
Proposed branch: | lp://qastaging/~harlowja/cloud-init/url-ssl-fixings | ||||
Merge into: | lp://qastaging/~cloud-init-dev/cloud-init/trunk | ||||
Diff against target: |
890 lines (+316/-163) 15 files modified
Requires (+6/-5) cloudinit/config/cc_phone_home.py (+3/-2) cloudinit/config/cc_power_state_change.py (+1/-1) cloudinit/distros/parsers/resolv_conf.py (+2/-2) cloudinit/ec2_utils.py (+5/-0) cloudinit/sources/DataSourceCloudStack.py (+6/-5) cloudinit/sources/DataSourceEc2.py (+7/-6) cloudinit/sources/DataSourceMAAS.py (+26/-19) cloudinit/url_helper.py (+159/-98) cloudinit/user_data.py (+3/-2) cloudinit/util.py (+79/-10) setup.py (+3/-2) tests/unittests/test__init__.py (+5/-5) tests/unittests/test_datasource/test_maas.py (+9/-6) tests/unittests/test_util.py (+2/-0) |
||||
To merge this branch: | bzr merge lp://qastaging/~harlowja/cloud-init/url-ssl-fixings | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Scott Moser | Needs Fixing | ||
Review via email:
|
To post a comment you must log in.
So I looked into the requests code, they are using in a underlying layer the HTTP[d]Connection objects and the regular ssl object, this should allow it to use the system certificates as a fallback. So thats good news!