From b203e09fc9e9ef6ab34445832c95d66019c62287 Mon Sep 17 00:00:00 2001
From: Jan Nidzwetzki <jan@timescale.com>
Date: Tue, 27 Jun 2023 12:36:29 +0200
Subject: [PATCH] Release 2.11.1

This release contains bug fixes since the 2.11.0 release. We recommend
that you upgrade at the next available opportunity.

**Features**
* #5679 Teach loader to load OSM extension

**Bugfixes**
* #5705 Scheduler accidentally getting killed when calling `delete_job`
* #5742 Fix Result node handling with ConstraintAwareAppend on
  compressed chunks
* #5750 Ensure tlist is present in decompress chunk plan
* #5754 Fixed handling of NULL values in bookend_sfunc
* #5798 Fixed batch look ahead in compressed sorted merge
* #5804 Mark cagg_watermark function as PARALLEL RESTRICTED
* #5807 Copy job config JSONB structure into current MemoryContext

**Thanks**
* @JamieD9 for reporting an issue with a wrong result ordering
* @xvaara for reporting an issue with Result node handling in
  ConstraintAwareAppend
---
 CHANGELOG.md                   | 22 ++++++++++++++++++++++
 sql/CMakeLists.txt             |  3 ++-
 sql/updates/2.11.0--2.11.1.sql |  0
 version.config                 |  2 +-
 4 files changed, 25 insertions(+), 2 deletions(-)
 create mode 100644 sql/updates/2.11.0--2.11.1.sql

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 95213fdc53c..e24e329ab04 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,28 @@
 `psql` with the `-X` flag to prevent any `.psqlrc` commands from
 accidentally triggering the load of a previous DB version.**
 
+## 2.11.1 (2023-06-29)
+
+This release contains bug fixes since the 2.11.0 release.
+We recommend that you upgrade at the next available opportunity.
+
+**Features**
+* #5679 Teach loader to load OSM extension
+
+**Bugfixes**
+* #5705 Scheduler accidentally getting killed when calling `delete_job`
+* #5742 Fix Result node handling with ConstraintAwareAppend on compressed chunks
+* #5750 Ensure tlist is present in decompress chunk plan 
+* #5754 Fixed handling of NULL values in bookend_sfunc 
+* #5798 Fixed batch look ahead in compressed sorted merge
+* #5804 Mark cagg_watermark function as PARALLEL RESTRICTED
+* #5807 Copy job config JSONB structure into current MemoryContext
+
+**Thanks**
+* @JamieD9 for reporting an issue with a wrong result ordering
+* @xvaara for reporting an issue with Result node handling in ConstraintAwareAppend
+
+
 ## 2.11.0 (2023-05-12)
 
 This release contains new features and bug fixes since the 2.10.3 release.
diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt
index 3fb0cb52e61..84910640466 100644
--- a/sql/CMakeLists.txt
+++ b/sql/CMakeLists.txt
@@ -48,7 +48,8 @@ set(MOD_FILES
     updates/2.10.0--2.10.1.sql
     updates/2.10.1--2.10.2.sql
     updates/2.10.2--2.10.3.sql
-    updates/2.10.3--2.11.0.sql)
+    updates/2.10.3--2.11.0.sql
+    updates/2.11.0--2.11.1.sql)
 
 # The downgrade file to generate a downgrade script for the current version, as
 # specified in version.config
diff --git a/sql/updates/2.11.0--2.11.1.sql b/sql/updates/2.11.0--2.11.1.sql
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/version.config b/version.config
index 9753b2c0218..dd342c5c564 100644
--- a/version.config
+++ b/version.config
@@ -1,3 +1,3 @@
 version = 2.12.0-dev
-update_from_version = 2.11.0
+update_from_version = 2.11.1
 downgrade_to_version = 2.11.0