From f2e7954913fd3927aa0d4425118bc5174c1a26fc Mon Sep 17 00:00:00 2001
From: Phil Davis <phil@jankaritech.com>
Date: Wed, 17 Nov 2021 10:28:21 +0545
Subject: [PATCH] Prepare 4.2.0 release

---
 CHANGELOG.md        | 11 +++++++++++
 lib/DAV/Version.php |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index da59f308c3..6d9affe773 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,17 @@
 ChangeLog
 =========
 
+4.2.0 (2021-11-17)
+-------------------------
+* #1317: Add primary key to schedulingobjects table in pgsql.calendars.sql example (@perguth)
+* #1335: don't remove lock on dir when deleting a child node (@tbsmark86)
+* #1341: Add new event "afterCreateCollection" like "afterCreateFile" (@woutersamaey)
+* #1344: Fix propfind type of subnodes with depth >= 1 (@n-peugnet)
+* #1355: Make sure a {DAV:}prop is not empty (@kesselb)
+* #1356: Switch CI to GitHub Actions (@kesselb)
+* #1362: Adjust PHPdoc return types (@phil-davis)
+* #1354: Fix deprecated usages on PHP 8.1 (@cedric-anne)
+
 4.1.5 (2021-02-12)
 -------------------------
 * #1322: Fixes for addressbook-query filters (@mstilkerich)
diff --git a/lib/DAV/Version.php b/lib/DAV/Version.php
index b25d6c07ae..13c2b01122 100644
--- a/lib/DAV/Version.php
+++ b/lib/DAV/Version.php
@@ -16,5 +16,5 @@ class Version
     /**
      * Full version number.
      */
-    public const VERSION = '4.1.5';
+    public const VERSION = '4.2.0';
 }