diff options
| author | Daniel Watkins <oddbloke@ubuntu.com> | 2021-01-04 10:41:19 -0500 |
|---|---|---|
| committer | James Falcon <therealfalcon@gmail.com> | 2021-03-22 09:42:30 -0500 |
| commit | d30cf1d4697ac9b3d25b74a1ebc4f8dd53ba07ac (patch) | |
| tree | 296dc42e2895a2e6ecef50dc6fa7bfe2b78189fc | |
| parent | 1a83dd357bf1e2f7bda3f9389c2eb215c3c8f944 (diff) | |
| download | cloud-init-git-d30cf1d4697ac9b3d25b74a1ebc4f8dd53ba07ac.tar.gz | |
d/cloud-init.manpages: include upstream manpages in package.
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | debian/cloud-init.manpages | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 75c71d1a..8deffa31 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,5 @@ cloud-init (21.1-19-gbad84ad4-0ubuntu1~20.10.1) UNRELEASED; urgency=medium - + * d/cloud-init.manpages: include upstream manpages in package (LP: #1908548) * drop the following cherry-picks now included: + cpick-4f62ae8d-Fix-regression-with-handling-of-IMDS-ssh-keys-760 * New upstream snapshot. (LP: #1920272) @@ -147,9 +147,11 @@ cloud-init (20.4.1-0ubuntu1~20.10.1) groovy; urgency=medium cloud-init (20.4-0ubuntu1~20.10.2) groovy; urgency=medium + * d/cloud-init.manpages: include upstream manpages in package (LP: #1908548) * cherry-pick 4f62ae8d: Fix regression with handling of IMDS ssh keys (#760) (LP: #1910835) + -- Daniel Watkins <oddbloke@ubuntu.com> Mon, 04 Jan 2021 10:44:13 -0500 -- Daniel Watkins <oddbloke@ubuntu.com> Mon, 11 Jan 2021 17:10:13 -0500 cloud-init (20.4-0ubuntu1~20.10.1) groovy; urgency=medium diff --git a/debian/cloud-init.manpages b/debian/cloud-init.manpages new file mode 100644 index 00000000..605cfd67 --- /dev/null +++ b/debian/cloud-init.manpages @@ -0,0 +1,3 @@ +doc/man/cloud-id.1 +doc/man/cloud-init-per.1 +doc/man/cloud-init.1 |