From 91d4f5165918fe2c359ef52afe624377906386c9 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Sat, 17 Jul 2021 09:16:10 +0200
Subject: Merging upstream version 2.6.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 CHANGES | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'CHANGES')

diff --git a/CHANGES b/CHANGES
index 6bb9cba..46bf1b8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,14 @@
-2020-03-25 Jerry Lundström
+2021-05-31 Jerry Lundström
+
+    Release 2.6.0
+
+    This release adds EDNS options parameter `-E` to `resperf` and a script
+    for generating EDNS Client Subnet options (see `contrib/ecs-gen`).
+
+    d29d880 ECS opt
+    877f31e edns option
+
+2021-03-25 Jerry Lundström
 
     Release 2.5.2
 
@@ -26,7 +36,7 @@
     22f49df network tests
     8e5b56e reconnect
 
-2020-03-22 Jerry Lundström
+2021-03-22 Jerry Lundström
 
     Release 2.5.1
 
-- 
cgit v1.2.3