Merge ~jgrimm/cloud-init:fix_resolve_conf_example into cloud-init:master

Proposed by Jon Grimm
Status: Merged
Merged at revision: 41f93a6000406ca974a5b9f5dc5e29f97bb59edb
Proposed branch: ~jgrimm/cloud-init:fix_resolve_conf_example
Merge into: cloud-init:master
Diff against target: 16 lines (+2/-2)
1 file modified
doc/examples/cloud-config-resolv-conf.txt (+2/-2)
Reviewer Review Type Date Requested Status
Server Team CI bot continuous-integration Approve
cloud-init Commiters Pending
Review via email: mp+321775@code.launchpad.net

Description of the change

Trivial doc fix.

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/doc/examples/cloud-config-resolv-conf.txt b/doc/examples/cloud-config-resolv-conf.txt
index 37ffc91..c4843f5 100644
--- a/doc/examples/cloud-config-resolv-conf.txt
+++ b/doc/examples/cloud-config-resolv-conf.txt
@@ -5,9 +5,9 @@
5#5#
6# Ensure that your yaml is valid and pass this as user-data when starting6# Ensure that your yaml is valid and pass this as user-data when starting
7# the instance. Also be sure that your cloud.cfg file includes this7# the instance. Also be sure that your cloud.cfg file includes this
8# configuration module in the appropirate section.8# configuration module in the appropriate section.
9#9#
10manage-resolv-conf: true10manage_resolv_conf: true
1111
12resolv_conf:12resolv_conf:
13 nameservers: ['8.8.4.4', '8.8.8.8']13 nameservers: ['8.8.4.4', '8.8.8.8']

Subscribers

People subscribed via source and target branches