summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Watkins <oddbloke@ubuntu.com>2021-01-28 10:48:59 -0500
committerGitHub <noreply@github.com>2021-01-28 10:48:59 -0500
commit71564dce3b6fa3e6aa398b0dd7415b21dca70701 (patch)
treefee907d133ca805da2a761d6b65395e26de1b013
parent6efe16d8f28b89423f7e6e60fc0d4ab1f385f4d8 (diff)
parent9db8620beda698a67548defe76f7b75da35db4b9 (diff)
downloadvyos-cloud-init-71564dce3b6fa3e6aa398b0dd7415b21dca70701.tar.gz
vyos-cloud-init-71564dce3b6fa3e6aa398b0dd7415b21dca70701.zip
Merge upstream/20.4.1 into master
upstream/20.4.1 was used to release the 20.4.1 hotfix. Merging it into master reconciles that fork in history, and integrates both the 20.4.1 changelog and tag into our main history.
-rw-r--r--ChangeLog3
-rw-r--r--cloudinit/version.py2
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index fb87a765..d0781ded 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+20.4.1
+ - Revert "ssh_util: handle non-default AuthorizedKeysFile config (#586)"
+
20.4
- tox: avoid tox testenv subsvars for xenial support (#684)
- Ensure proper root permissions in integration tests (#664) [James Falcon]
diff --git a/cloudinit/version.py b/cloudinit/version.py
index f25e9145..36ec728e 100644
--- a/cloudinit/version.py
+++ b/cloudinit/version.py
@@ -4,7 +4,7 @@
#
# This file is part of cloud-init. See LICENSE file for license information.
-__VERSION__ = "20.4"
+__VERSION__ = "20.4.1"
_PACKAGED_VERSION = '@@PACKAGED_VERSION@@'
FEATURES = [