summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Watkins <oddbloke@ubuntu.com>2021-01-15 12:32:57 -0500
committerDaniel Watkins <oddbloke@ubuntu.com>2021-01-15 12:33:05 -0500
commit9db8620beda698a67548defe76f7b75da35db4b9 (patch)
tree4a66358dbfff11f2a2cb28cafbd6ca4c7b59a6de
parent6fc9da9930485f4aa42aca6f2f7aa6f520223ec2 (diff)
downloadcloud-init-git-upstream/20.4.1.tar.gz
Release 20.4.120.4.1upstream/20.4.1
Bump the version in cloudinit/version.py to 20.4.1 and update ChangeLog. LP: #1911680
-rw-r--r--ChangeLog3
-rw-r--r--cloudinit/version.py2
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 33b2bf74..9b41924a 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 = [