Merge ~floriangrignon/cloud-init:log-typo into cloud-init:master

Proposed by Florian Grignon
Status: Merged
Merged at revision: df182de41fd75bc0cf2b1de2b511c37527d45475
Proposed branch: ~floriangrignon/cloud-init:log-typo
Merge into: cloud-init:master
Diff against target: 51 lines (+7/-7)
3 files modified
cloudinit/config/cc_rsyslog.py (+5/-5)
cloudinit/sources/__init__.py (+1/-1)
doc/rtd/topics/network-config-format-v1.rst (+1/-1)
Reviewer Review Type Date Requested Status
Scott Moser Approve
Review via email: mp+336501@code.launchpad.net

Description of the change

Fixed typo double word 'for' encountered while reading some logs on a host.

To post a comment you must log in.
Revision history for this message
Scott Moser (smoser) wrote :

Florian,
I merged this in today, but mistakingly let your 'aRkadeFR' name go in (from the git commit message).

In the future, please set your real name as the author. (I'm sure this was just oversite).

Thanks for your contribution.

Revision history for this message
Florian Grignon (floriangrignon) wrote :

Thanks Scott for your time and sorry about the commit author name.
I only followed the https://cloudinit.readthedocs.io/en/latest/topics/hacking.html documentation to contribute quickly to the project, and haven't changed my git config.
Will set my real name for later contribution.

Revision history for this message
Scott Moser (smoser) wrote :

I put up
 https://code.launchpad.net/~smoser/cloud-init/+git/cloud-init/+merge/336623
to have instructions in HACKING.rst.

Thanks agagin.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/cloudinit/config/cc_rsyslog.py b/cloudinit/config/cc_rsyslog.py
2index 50ff9e3..af08788 100644
3--- a/cloudinit/config/cc_rsyslog.py
4+++ b/cloudinit/config/cc_rsyslog.py
5@@ -20,15 +20,15 @@ which defaults to ``20-cloud-config.conf``. The rsyslog config directory to
6 write config files to may be specified in ``config_dir``, which defaults to
7 ``/etc/rsyslog.d``.
8
9-A list of configurations for for rsyslog can be specified under the ``configs``
10-key in the ``rsyslog`` config. Each entry in ``configs`` is either a string or
11-a dictionary. Each config entry contains a configuration string and a file to
12+A list of configurations for rsyslog can be specified under the ``configs`` key
13+in the ``rsyslog`` config. Each entry in ``configs`` is either a string or a
14+dictionary. Each config entry contains a configuration string and a file to
15 write it to. For config entries that are a dictionary, ``filename`` sets the
16 target filename and ``content`` specifies the config string to write. For
17 config entries that are only a string, the string is used as the config string
18 to write. If the filename to write the config to is not specified, the value of
19-the ``config_filename`` key is used. A file with the selected filename will
20-be written inside the directory specified by ``config_dir``.
21+the ``config_filename`` key is used. A file with the selected filename will be
22+written inside the directory specified by ``config_dir``.
23
24 The command to use to reload the rsyslog service after the config has been
25 updated can be specified in ``service_reload_command``. If this is set to
26diff --git a/cloudinit/sources/__init__.py b/cloudinit/sources/__init__.py
27index 4b819ce..a05ca2f 100644
28--- a/cloudinit/sources/__init__.py
29+++ b/cloudinit/sources/__init__.py
30@@ -448,7 +448,7 @@ def find_source(sys_cfg, distro, paths, ds_deps, cfg_list, pkg_list, reporter):
31 # Return an ordered list of classes that match (if any)
32 def list_sources(cfg_list, depends, pkg_list):
33 src_list = []
34- LOG.debug(("Looking for for data source in: %s,"
35+ LOG.debug(("Looking for data source in: %s,"
36 " via packages %s that matches dependencies %s"),
37 cfg_list, pkg_list, depends)
38 for ds_name in cfg_list:
39diff --git a/doc/rtd/topics/network-config-format-v1.rst b/doc/rtd/topics/network-config-format-v1.rst
40index ce3a1bd..2f8ab54 100644
41--- a/doc/rtd/topics/network-config-format-v1.rst
42+++ b/doc/rtd/topics/network-config-format-v1.rst
43@@ -349,7 +349,7 @@ For any network device (one of the Config Types) users can define a list of
44 entries will create interface alias allowing a single interface to use
45 different ip configurations.
46
47-Valid keys for for ``subnets`` include the following:
48+Valid keys for ``subnets`` include the following:
49
50 - ``type``: Specify the subnet type.
51 - ``control``: Specify manual, auto or hotplug. Indicates how the interface

Subscribers

People subscribed via source and target branches