From 048e151bec8c7815620dfe31083305cf56177ea3 Mon Sep 17 00:00:00 2001
From: Steven Murray <Steven.Murray@cern.ch>
Date: Thu, 11 Mar 2021 09:53:03 +0100
Subject: [PATCH] Combined/merged v4.0-2 into v4.NEXT

---
 ReleaseNotes.md | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/ReleaseNotes.md b/ReleaseNotes.md
index 0a7b0ec7d8..cd63784939 100644
--- a/ReleaseNotes.md
+++ b/ReleaseNotes.md
@@ -6,27 +6,15 @@
 
 - Upgraded EOS to 4.8.40
 - Upgraded eos-xrootd to 4.12.8
-
-### Bug fixes
-
-- cta/CTA#927 Bad message for archive route pointing non-existing pool
-- cta/CTA#969 `xrdfs query prepare` malformed JSON output 
-
-# v4.0-2
-
-## Summary
-
-### Features
-
-- Upgraded EOS to 4.8.39
-- Upgraded eos-xrootd to 4.12.7
 - cta/CTA#966 Unable to distinguish empty and wrong tape pool
 - cta/CTA#926 Improve MigrationReportPacker::ReportSkipped::execute() exception message
 
 ### Bug fixes
 
-- cta/CTA#930 Batched the queueing and the deleting of the repack subrequests
 - cta/CTA#669 cta-taped now display the correct error message when the drive device does not exist
+- cta/CTA#927 Bad message for archive route pointing non-existing pool
+- cta/CTA#930 Batched the queueing and the deleting of the repack subrequests
+- cta/CTA#969 `xrdfs query prepare` malformed JSON output 
 
 # v4.0-1
 
-- 
GitLab