From: Christopher Faulet <cfaulet@haproxy.com>
Date: Tue, 9 Jun 2020 06:44:30 +0000 (+0200)
Subject: [RELEASE] Released version 2.1.7
X-Git-Tag: v2.1.7^0
X-Git-Url: http://git.haproxy.org/?a=commitdiff_plain;h=8bebf80fb5550f5b32e0bec83d1b819b1bf482d6;p=haproxy-2.1.git

[RELEASE] Released version 2.1.7

Released version 2.1.7 with the following main changes :
    - BUG/MAJOR: http-htx: Don't forget to copy error messages from defaults sections
---

diff --git a/CHANGELOG b/CHANGELOG
index 393316f..c11fd26 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,9 @@
 ChangeLog :
 ===========
 
+2020/06/09 : 2.1.7
+    - BUG/MAJOR: http-htx: Don't forget to copy error messages from defaults sections
+
 2020/06/08 : 2.1.6
     - Revert "BUG/MEDIUM: connections: force connections cleanup on server changes"
     - SCRIPTS: publish-release: pass -n to gzip to remove timestamp
diff --git a/VERDATE b/VERDATE
index c0cb9f5..6a266a1 100644
--- a/VERDATE
+++ b/VERDATE
@@ -1,2 +1,2 @@
 $Format:%ci$
-2020/06/08
+2020/06/09
diff --git a/VERSION b/VERSION
index 399088b..04b10b4 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.1.6
+2.1.7
diff --git a/doc/configuration.txt b/doc/configuration.txt
index 2c19fe8..3d906c1 100644
--- a/doc/configuration.txt
+++ b/doc/configuration.txt
@@ -4,7 +4,7 @@
                          ----------------------
                               version 2.1
                              willy tarreau
-                              2020/06/08
+                              2020/06/09
 
 
 This document covers the configuration language as implemented in the version