From 7c17e49bcb1a46d0e488266792a13b07cf3d0684 Mon Sep 17 00:00:00 2001
From: Valeriu Predoi <valeriu.predoi@gmail.com>
Date: Thu, 8 Dec 2022 15:45:24 +0000
Subject: [PATCH] update changelog with all changes to main included in bugfix
 release

---
 doc/changelog.rst | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/doc/changelog.rst b/doc/changelog.rst
index 0b1170fe2f..80c61e2730 100644
--- a/doc/changelog.rst
+++ b/doc/changelog.rst
@@ -10,11 +10,12 @@ v2.7.1
 Highlights
 ~~~~~~~~~~
 
-This is a bugfix release where we unpin `cf-units` to allow for latest `iris=3.4.0` to be installed.
+This is a bugfix release where we unpin `cf-units` to allow for latest `iris=3.4.0` to be installed. Changelog contains only changes that were made to the main branch.
 
 Installation
 ~~~~~~~~~~~~
 
+- Set the version number on the development branches to one minor version more than the previous release (`#1854 <https://github.com/ESMValGroup/ESMValCore/pull/1854>`__) `Bouwe Andela <https://github.com/bouweandela>`__
 - Unpin cf-units (`#1770 <https://github.com/ESMValGroup/ESMValCore/pull/1770>`__) `Bouwe Andela <https://github.com/bouweandela>`__
 
 Bug fixes
@@ -22,6 +23,10 @@ Bug fixes
 
 - Improve error handling if an esgf index node is offline (`#1834 <https://github.com/ESMValGroup/ESMValCore/pull/1834>`__) `Bouwe Andela <https://github.com/bouweandela>`__
 
+Automatic testing
+~~~~~~~~~~~~~~~~~
+
+- Removed unnecessary test that fails with iris 3.4.0 (`#1846 <https://github.com/ESMValGroup/ESMValCore/pull/1846>`__) `Manuel Schlund <https://github.com/schlunma>`__
 
 
 .. _changelog-v2-7-0: