From d65a04c6be5f738c6e3beee3d1628afddaf28b9a Mon Sep 17 00:00:00 2001
From: Ruslan Fomkin <ruslan.fomkin@gmail.com>
Date: Mon, 29 Mar 2021 13:08:56 +0200
Subject: [PATCH] Release 2.1.1

This maintenance release contains bugfixes since the 2.1.0 release. We
deem it high priority for upgrading.

The bug fixes in this release address issues with CREATE INDEX and
UPSERT for hypertables, custom jobs, and gapfill queries.

This release marks TimescaleDB as a trusted extension in PG13, so that
superuser privileges are not required anymore to install the extension.

**Minor features**
* #2998 Mark timescaledb as trusted extension

**Bugfixes**
* #2948 Fix off by 4 error in histogram deserialize
* #2974 Fix index creation for hypertables with dropped columns
* #2990 Fix segfault in job_config_check for cagg
* #2987 Fix crash due to txns in emit_log_hook_callback
* #3042 Commit end transaction for CREATE INDEX
* #3053 Fix gapfill/hashagg planner interaction
* #3059 Fix UPSERT on hypertables with columns with defaults

**Thanks**
* @eloyekunle and @kitwestneat for reporting an issue with UPSERT
* @jocrau for reporting an issue with index creation
* @kev009 for fixing a compilation issue
* @majozv and @pehlert for reporting an issue with time_bucket_gapfill
---
 CHANGELOG.md       | 20 +++++++++++++++++---
 sql/CMakeLists.txt |  1 +
 version.config     |  4 ++--
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5357d5f43e2..b69996cf152 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,10 +4,25 @@
 `psql` with the `-X` flag to prevent any `.psqlrc` commands from
 accidentally triggering the load of a previous DB version.**
 
-## Unreleased
+## 2.1.1 (2021-03-29)
+
+This maintenance release contains bugfixes since the 2.1.0 release. We
+deem it high priority for upgrading.
+
+The bug fixes in this release address issues with CREATE INDEX and 
+UPSERT for hypertables, custom jobs, and gapfill queries.
+
+This release marks TimescaleDB as a trusted extension in PG13, so that 
+superuser privileges are not required anymore to install the extension.
+
+**Minor features**
+* #2998 Mark timescaledb as trusted extension
 
 **Bugfixes**
+* #2948 Fix off by 4 error in histogram deserialize
 * #2974 Fix index creation for hypertables with dropped columns
+* #2990 Fix segfault in job_config_check for cagg
+* #2987 Fix crash due to txns in emit_log_hook_callback
 * #3042 Commit end transaction for CREATE INDEX
 * #3053 Fix gapfill/hashagg planner interaction
 * #3059 Fix UPSERT on hypertables with columns with defaults
@@ -15,9 +30,8 @@ accidentally triggering the load of a previous DB version.**
 **Thanks**
 * @eloyekunle and @kitwestneat for reporting an issue with UPSERT
 * @jocrau for reporting an issue with index creation
+* @kev009 for fixing a compilation issue
 * @majozv and @pehlert for reporting an issue with time_bucket_gapfill
-* @pedrokost and @RobAtticus for reporting an issue with size
-  functions on empty hypertables
 
 ## 2.1.0 (2021-02-22)
 
diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt
index c7471b07ddb..f01be5b12dc 100644
--- a/sql/CMakeLists.txt
+++ b/sql/CMakeLists.txt
@@ -107,6 +107,7 @@ set(MOD_FILES
   updates/2.0.0--2.0.1.sql
   updates/2.0.1--2.0.2.sql
   updates/2.0.2--2.1.0.sql
+  updates/2.1.0--2.1.1.sql
 )
 
 set(MODULE_PATHNAME "$libdir/timescaledb-${PROJECT_VERSION_MOD}")
diff --git a/version.config b/version.config
index 7c17c68ed4d..1f2afe393f3 100644
--- a/version.config
+++ b/version.config
@@ -1,2 +1,2 @@
-version = 2.1.0
-update_from_version = 2.0.2
+version = 2.1.1
+update_from_version = 2.1.0