From 0688ef03fdaf8dda9c3a8c383926ede926f6e624 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Feb 05 2021 06:10:15 +0000 Subject: import cloud-init-20.3-10.el8 --- diff --git a/SOURCES/ci-fix-a-typo-in-man-page-cloud-init.1-752.patch b/SOURCES/ci-fix-a-typo-in-man-page-cloud-init.1-752.patch new file mode 100644 index 0000000..0a08abf --- /dev/null +++ b/SOURCES/ci-fix-a-typo-in-man-page-cloud-init.1-752.patch @@ -0,0 +1,53 @@ +From c90d5c11eb99ec25e0fd90585bad9283e60bda7e Mon Sep 17 00:00:00 2001 +From: Eduardo Otubo +Date: Tue, 26 Jan 2021 10:48:55 +0100 +Subject: [PATCH] fix a typo in man page cloud-init.1 (#752) + +RH-Author: Eduardo Terrell Ferrari Otubo (eterrell) +RH-MergeRequest: 39: fix a typo in man page cloud-init.1 (#752) +RH-Commit: [1/1] d2f7efbc63a7928ef175ac0714053dba20aab01a (eterrell/cloud-init) +RH-Bugzilla: 1913127 + +commit 48b2c5f16bd4ef754fef137ea19894908d4bf1db +Author: Amy Chen <66719270+xiachen-rh@users.noreply.github.com> +Date: Wed Jan 6 22:37:02 2021 +0800 + + fix a typo in man page cloud-init.1 (#752) + + 1. fix a typo in cloud-init.1 + 2. add xiachen-rh as contributor + +Conflict: We don't really use tools/.github-cla-signers, but had to fix +a tiny conflict of already included names on the file. + +Signed-off-by: Eduardo Otubo +--- + doc/man/cloud-init.1 | 2 +- + tools/.github-cla-signers | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/doc/man/cloud-init.1 b/doc/man/cloud-init.1 +index 9b52dc8d..3fde4148 100644 +--- a/doc/man/cloud-init.1 ++++ b/doc/man/cloud-init.1 +@@ -10,7 +10,7 @@ cloud-init \- Cloud instance initialization + Cloud-init provides a mechanism for cloud instance initialization. + This is done by identifying the cloud platform that is in use, reading + provided cloud metadata and optional vendor and user +-data, and then intializing the instance as requested. ++data, and then initializing the instance as requested. + + Generally, this command is not normally meant to be run directly by + the user. However, some subcommands may useful for development or +diff --git a/tools/.github-cla-signers b/tools/.github-cla-signers +index 802a35bd..e5d2b95c 100644 +--- a/tools/.github-cla-signers ++++ b/tools/.github-cla-signers +@@ -21,3 +21,4 @@ sshedi + TheRealFalcon + tomponline + tsanghan ++xiachen-rh +-- +2.18.4 + diff --git a/SPECS/cloud-init.spec b/SPECS/cloud-init.spec index c476bcc..cedad04 100644 --- a/SPECS/cloud-init.spec +++ b/SPECS/cloud-init.spec @@ -6,7 +6,7 @@ Name: cloud-init Version: 20.3 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Cloud instance init scripts Group: System Environment/Base @@ -38,6 +38,8 @@ Patch14: ci-Missing-IPV6_AUTOCONF-no-to-render-sysconfig-dhcp6-s.patch Patch15: ci-DataSourceAzure-update-password-for-defuser-if-exist.patch # For bz#1919972 - [RHEL-8.4] ssh keys can be shared across users giving potential root access Patch16: ci-Revert-ssh_util-handle-non-default-AuthorizedKeysFil.patch +# For bz#1913127 - A typo in cloud-init man page +Patch17: ci-fix-a-typo-in-man-page-cloud-init.1-752.patch BuildArch: noarch @@ -229,6 +231,11 @@ fi %config(noreplace) %{_sysconfdir}/rsyslog.d/21-cloudinit.conf %changelog +* Tue Feb 02 2021 Miroslav Rezanina - 20.3-10.el8 +- ci-fix-a-typo-in-man-page-cloud-init.1-752.patch [bz#1913127] +- Resolves: bz#1913127 + (A typo in cloud-init man page) + * Tue Jan 26 2021 Miroslav Rezanina - 20.3-9.el8 - ci-DataSourceAzure-update-password-for-defuser-if-exist.patch [bz#1900892] - ci-Revert-ssh_util-handle-non-default-AuthorizedKeysFil.patch [bz#1919972]