Release 21.1

[OddBloke]

Proposed Commit Message

Release 21.1

Bump the version in cloudinit/version.py to 21.1 and
update ChangeLog.

LP: #1916540

Additional Info

Due to the 20.4.1 hotfix, a couple of manual modifications to our automated output were made. The merge commit was removed from the changelog, and the automatically incremented version was fixed up (from 21.1.1).

Checklist:

• My code follows the process laid out in the documentation
• I have updated or added any unit tests accordingly
• I have updated or added any documentation accordingly

[TheRealFalcon]

My diff. Based on your comments I'm assuming I should expect this.

diff --git a/ChangeLog b/ChangeLog
index b23437a2..a8c96a1e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,0 +24 @@
+ - Merge upstream/20.4.1 into master
diff --git a/cloudinit/version.py b/cloudinit/version.py
index 94afd60d..2fe28021 100644
--- a/cloudinit/version.py
+++ b/cloudinit/version.py
@@ -7 +7 @@
-__VERSION__ = "21.1"
+__VERSION__ = "21.1.1"

We didn't release 20.4.1 upstream, did we? If we did, then we can skip the two commits for the revert commit and release for that.

[blackboxsw]

+1 and can confirm we wanted to set 21.1 instead of 21.1.1, the tooling didn't expect to deal w/ hotfix "patch" version as you mentioned.

[OddBloke]

My diff. Based on your comments I'm assuming I should expect this.

diff --git a/ChangeLog b/ChangeLog
index b23437a2..a8c96a1e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,0 +24 @@
+ - Merge upstream/20.4.1 into master
diff --git a/cloudinit/version.py b/cloudinit/version.py
index 94afd60d..2fe28021 100644
--- a/cloudinit/version.py
+++ b/cloudinit/version.py
@@ -7 +7 @@
-__VERSION__ = "21.1"
+__VERSION__ = "21.1.1"

We didn't release 20.4.1 upstream, did we? If we did, then we can skip the two commits for the revert commit and release for that.

We did release 20.4.1 upstream, it's actually already in this changelog. I've removed the repeated lines:

--- a/ChangeLog
+++ b/ChangeLog
@@ -35,10 +35,6 @@
  - Use proper spelling for Red Hat (#778) [Dan Kenigsberg]
  - Add antonyc to .github-cla-signers (#747) [Anton Chaporgin]
  - integration_tests: log image serial if available (#772)
- - Revert "ssh_util: handle non-default AuthorizedKeysFile config (#586)"
-   (#775)
- - Release 20.4.1 (LP: #1911680)
- - Revert "ssh_util: handle non-default AuthorizedKeysFile config (#586)"
  - [VMware] Support cloudinit raw data feature (#691) [xiaofengw-vmware]
  - net: Fix static routes to host in eni renderer (#668) [Pavel Abalikhin]
  - .travis.yml: don't run cloud_tests in CI (#756)