Merge ~d-info-e/cloud-init:fix-typos into cloud-init:master

Proposed by do3meli
Status: Merged
Approved by: Scott Moser
Approved revision: 76fda6b399e0a1adcd1e7acebaad259bb223ab77
Merge reported by: Server Team CI bot
Merged at revision: not available
Proposed branch: ~d-info-e/cloud-init:fix-typos
Merge into: cloud-init:master
Diff against target: 61 lines (+6/-6)
3 files modified
cloudinit/ (+1/-1)
cloudinit/ (+2/-2)
cloudinit/ (+3/-3)
Reviewer Review Type Date Requested Status
Server Team CI bot continuous-integration Approve
cloud-init Commiters Pending
Review via email:

Commit message

Small typo fixes in code comments.

To post a comment you must log in.
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
1diff --git a/cloudinit/ b/cloudinit/
2index 5012988..77c21de 100644
3--- a/cloudinit/
4+++ b/cloudinit/
5@@ -501,7 +501,7 @@ class Init(object):
6 # Init the handlers first
7 for (_ctype, mod) in c_handlers.items():
8 if mod in c_handlers.initialized:
9- # Avoid initing the same module twice (if said module
10+ # Avoid initiating the same module twice (if said module
11 # is registered to more than one content-type).
12 continue
13 handlers.call_begin(mod, data, frequency)
14diff --git a/cloudinit/ b/cloudinit/
15index b668674..e47cded 100644
16--- a/cloudinit/
17+++ b/cloudinit/
20 @implements_to_string # Needed for python2.7. Otherwise cached super.__str__
21 class UndefinedJinjaVariable(JUndefined):
22- """Class used to represent any undefined jinja template varible."""
23+ """Class used to represent any undefined jinja template variable."""
25 def __str__(self):
26 return u'%s%s' % (MISSING_JINJA_PREFIX, self._undefined_name)
27@@ -58,7 +58,7 @@ class UndefinedJinjaVariable(JUndefined):
30 def basic_render(content, params):
31- """This does sumple replacement of bash variable like templates.
32+ """This does simple replacement of bash variable like templates.
34 It identifies patterns like ${a} or $a and can also identify patterns like
35 ${a.b} or $a.b which will look for a key 'b' in the dictionary rooted
36diff --git a/cloudinit/ b/cloudinit/
37index 44ee61d..0f4c36f 100644
38--- a/cloudinit/
39+++ b/cloudinit/
40@@ -326,10 +326,10 @@ def wait_for_url(urls, max_wait=None, timeout=None,
41 sleep_time_cb: call method with 2 arguments (response, loop_n) that
42 generates the next sleep time.
44- the idea of this routine is to wait for the EC2 metdata service to
45+ the idea of this routine is to wait for the EC2 metadata service to
46 come up. On both Eucalyptus and EC2 we have seen the case where
47 the instance hit the MD before the MD service was up. EC2 seems
48- to have permenantely fixed this, though.
49+ to have permanently fixed this, though.
51 In openstack, the metadata service might be painfully slow, and
52 unable to avoid hitting a timeout of even up to 10 seconds or more
53@@ -338,7 +338,7 @@ def wait_for_url(urls, max_wait=None, timeout=None,
54 Offset those needs with the need to not hang forever (and block boot)
55 on a system where cloud-init is configured to look for EC2 Metadata
56 service but is not going to find one. It is possible that the instance
57- data host ( may be firewalled off Entirely for a sytem,
58+ data host ( may be firewalled off Entirely for a system,
59 meaning that the connection will block forever unless a timeout is set.
61 A value of None for max_wait will retry indefinitely.


People subscribed via source and target branches