diff options
| author | Daniel Watkins <oddbloke@ubuntu.com> | 2021-01-28 10:48:59 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-28 10:48:59 -0500 |
| commit | 71564dce3b6fa3e6aa398b0dd7415b21dca70701 (patch) | |
| tree | fee907d133ca805da2a761d6b65395e26de1b013 /ChangeLog | |
| parent | 6efe16d8f28b89423f7e6e60fc0d4ab1f385f4d8 (diff) | |
| parent | 9db8620beda698a67548defe76f7b75da35db4b9 (diff) | |
| download | vyos-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.
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -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] |