Merge ~brian-murray/cloud-init:master into cloud-init:master

Proposed by Brian Murray
Status: Merged
Approved by: Chad Smith
Approved revision: 346debcdbb3d8bcb75ff837206eb0f7d80d002ca
Merge reported by: Server Team CI bot
Merged at revision: not available
Proposed branch: ~brian-murray/cloud-init:master
Merge into: cloud-init:master
Diff against target: 13 lines (+1/-1)
1 file modified
cloudinit/config/cc_ubuntu_advantage.py (+1/-1)
Reviewer Review Type Date Requested Status
Server Team CI bot continuous-integration Approve
Chad Smith Approve
Review via email: mp+367486@code.launchpad.net

Commit message

Fix spelling error making 'an Ubuntu' consistent.

To post a comment you must log in.
Revision history for this message
Server Team CI bot (server-team-bot) wrote :

FAILED: Continuous integration, rev:346debcdbb3d8bcb75ff837206eb0f7d80d002ca
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/~brian-murray/cloud-init/+git/cloud-init/+merge/367486/+edit-commit-message

https://jenkins.ubuntu.com/server/job/cloud-init-ci/728/
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/728/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Chad Smith (chad.smith) wrote :

Approved here, that was an invalid CI failure above

review: Approve
Revision history for this message
Server Team CI bot (server-team-bot) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/cloudinit/config/cc_ubuntu_advantage.py b/cloudinit/config/cc_ubuntu_advantage.py
index f488123..f846e9a 100644
--- a/cloudinit/config/cc_ubuntu_advantage.py
+++ b/cloudinit/config/cc_ubuntu_advantage.py
@@ -36,7 +36,7 @@ schema = {
36 """),36 """),
37 'distros': distros,37 'distros': distros,
38 'examples': [dedent("""\38 'examples': [dedent("""\
39 # Attach the machine to a Ubuntu Advantage support contract with a39 # Attach the machine to an Ubuntu Advantage support contract with a
40 # UA contract token obtained from %s.40 # UA contract token obtained from %s.
41 ubuntu_advantage:41 ubuntu_advantage:
42 token: <ua_contract_token>42 token: <ua_contract_token>

Subscribers

People subscribed via source and target branches