Merge ~daniel-thewatkins/cloud-init/+git/cloud-init:warn into cloud-init:master

Proposed by Dan Watkins on 2019-05-07
Status: Merged
Approved by: Ryan Harper on 2019-05-08
Approved revision: 6797e822959b84c98cf73e02b2a6e3d6ab3fd4fe
Merge reported by: Server Team CI bot
Merged at revision: not available
Proposed branch: ~daniel-thewatkins/cloud-init/+git/cloud-init:warn
Merge into: cloud-init:master
Diff against target: 26 lines (+2/-2)
2 files modified
cloudinit/sources/DataSourceCloudStack.py (+1/-1)
cloudinit/sources/DataSourceEc2.py (+1/-1)
Reviewer Review Type Date Requested Status
Server Team CI bot continuous-integration Approve on 2019-05-08
Ryan Harper 2019-05-07 Approve on 2019-05-07
Review via email: mp+367054@code.launchpad.net

Commit message

replace remaining occurrences of LOG.warn

To post a comment you must log in.
Ryan Harper (raharper) wrote :

LGTM

review: Approve

FAILED: Continuous integration, rev:6797e822959b84c98cf73e02b2a6e3d6ab3fd4fe
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~daniel-thewatkins/cloud-init/+git/cloud-init/+merge/367054/+edit-commit-message

https://jenkins.ubuntu.com/server/job/cloud-init-ci/706/
Executed test runs:
    SUCCESS: Checkout
    SUCCESS: Unit & Style Tests
    SUCCESS: Ubuntu LTS: Build
    SUCCESS: Ubuntu LTS: Integration
    IN_PROGRESS: Declarative: Post Actions

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/706/rebuild

review: Needs Fixing (continuous-integration)
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/cloudinit/sources/DataSourceCloudStack.py b/cloudinit/sources/DataSourceCloudStack.py
2index d4b758f..f185dc7 100644
3--- a/cloudinit/sources/DataSourceCloudStack.py
4+++ b/cloudinit/sources/DataSourceCloudStack.py
5@@ -95,7 +95,7 @@ class DataSourceCloudStack(sources.DataSource):
6 start_time = time.time()
7 url = uhelp.wait_for_url(
8 urls=urls, max_wait=url_params.max_wait_seconds,
9- timeout=url_params.timeout_seconds, status_cb=LOG.warn)
10+ timeout=url_params.timeout_seconds, status_cb=LOG.warning)
11
12 if url:
13 LOG.debug("Using metadata source: '%s'", url)
14diff --git a/cloudinit/sources/DataSourceEc2.py b/cloudinit/sources/DataSourceEc2.py
15index ac28f1d..5c017bf 100644
16--- a/cloudinit/sources/DataSourceEc2.py
17+++ b/cloudinit/sources/DataSourceEc2.py
18@@ -208,7 +208,7 @@ class DataSourceEc2(sources.DataSource):
19 start_time = time.time()
20 url = uhelp.wait_for_url(
21 urls=urls, max_wait=url_params.max_wait_seconds,
22- timeout=url_params.timeout_seconds, status_cb=LOG.warn)
23+ timeout=url_params.timeout_seconds, status_cb=LOG.warning)
24
25 if url:
26 self.metadata_address = url2base[url]

Subscribers

People subscribed via source and target branches