From 394994c42fdb8328a50aab67c0fc1d8f3762d93b Mon Sep 17 00:00:00 2001
From: Jaime Martinez <jmartinez@gitlab.com>
Date: Tue, 11 Aug 2020 14:24:56 +1000
Subject: [PATCH] Release 1.22.0

---
 CHANGELOG | 7 +++++++
 VERSION   | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 44d286e6c..4c9a5ab94 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,10 @@
+v 1.22.0
+
+- Serve custom 404.html file for namespace domains !263
+- Poll internal status API !304 !306
+- Enable `domain-config-source=disk` by default Use domain config source disk !305
+- Set Content-Length when Content-Encoding is set !227
+
 v 1.21.0
 
 - Copy certs from SSL_CERT_DIR into chroot jail !291
diff --git a/VERSION b/VERSION
index 3500250a4..57807d6d0 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.21.0
+1.22.0
-- 
GitLab