You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by ep...@apache.org on 2022/03/28 19:43:56 UTC

[airflow] 04/05: Add 2.2.5 to CHANGELOG.txt and UPDATING.md

This is an automated email from the ASF dual-hosted git repository.

ephraimanierobi pushed a commit to branch v2-2-stable
in repository https://gitbox.apache.org/repos/asf/airflow.git

commit 012b22e65a57ceda4920070a12e2dfc96489655c
Author: Ephraim Anierobi <sp...@gmail.com>
AuthorDate: Thu Mar 24 02:39:28 2022 +0100

    Add 2.2.5 to CHANGELOG.txt and UPDATING.md
---
 CHANGELOG.txt | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 799059a..50c53d2 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,10 +1,8 @@
-Airflow 2.2.5, 2022-03-28
+Airflow 2.2.5, 2022-03-31
 -------------------------
 
 Bug Fixes
 """""""""
-- Fix handling some None parameters in kubernetes 23 libs. (#21905)
-- Remove RefreshConfiguration workaround for K8s token refreshing (#20759)
 - Check and disallow a relative path for sqlite (#22530)
 - Fixed dask executor and tests (#22027)
 - Fix broken links to celery documentation (#22364)
@@ -48,7 +46,10 @@ Doc only changes
 
 Misc
 """"
+<<<<<<< HEAD
 - Update Kubernetes library version (#18797)
+=======
+>>>>>>> Add 2.2.5 to CHANGELOG.txt and UPDATING.md
 - Add the new Airflow Trove Classifier to setup.cfg (#22241)
 - Rename ``to_delete`` to ``to_cancel`` in TriggerRunner (#20658)