From 44eab9cf9bef34274c88efd37a750eaa74cd8044 Mon Sep 17 00:00:00 2001
From: Konstantina Skovola <konstantina@timescale.com>
Date: Wed, 9 Aug 2023 15:26:03 +0300
Subject: [PATCH] Release 2.11.2

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

**Features**
* #5923 Feature flags for TimescaleDB features

**Bugfixes**
* #5680 Fix DISTINCT query with JOIN on multiple segmentby columns
* #5774 Fixed two bugs in decompression sorted merge code
* #5786 Ensure pg_config --cppflags are passed
* #5906 Fix quoting owners in sql scripts.
* #5912 Fix crash in 1-step integer policy creation

**Thanks**
* @mrksngl for submitting a PR to fix extension upgrade scripts
* @ericdevries for reporting an issue with DISTINCT queries using
segmentby columns of compressed hypertable
---
 .unreleased/PR_5906            |  3 ---
 .unreleased/PR_5923            |  1 -
 .unreleased/bugfix_5774        |  1 -
 .unreleased/bugfix_5786        |  1 -
 .unreleased/bugfix_5907        |  1 -
 CHANGELOG.md                   | 19 +++++++++++++++++--
 sql/CMakeLists.txt             |  3 ++-
 sql/updates/2.11.1--2.11.2.sql |  0
 version.config                 |  2 +-
 9 files changed, 20 insertions(+), 11 deletions(-)
 delete mode 100644 .unreleased/PR_5906
 delete mode 100644 .unreleased/PR_5923
 delete mode 100644 .unreleased/bugfix_5774
 delete mode 100644 .unreleased/bugfix_5786
 delete mode 100644 .unreleased/bugfix_5907
 create mode 100644 sql/updates/2.11.1--2.11.2.sql

diff --git a/.unreleased/PR_5906 b/.unreleased/PR_5906
deleted file mode 100644
index d1ba94459..000000000
--- a/.unreleased/PR_5906
+++ /dev/null
@@ -1,3 +0,0 @@
-Fixes: #5906 Fix quoting owners in sql scripts.
-
-Thanks: @mrksngl
diff --git a/.unreleased/PR_5923 b/.unreleased/PR_5923
deleted file mode 100644
index bb43a30e5..000000000
--- a/.unreleased/PR_5923
+++ /dev/null
@@ -1 +0,0 @@
-Implements: #5923 Feature flags for TimescaleDB features
diff --git a/.unreleased/bugfix_5774 b/.unreleased/bugfix_5774
deleted file mode 100644
index 84e382800..000000000
--- a/.unreleased/bugfix_5774
+++ /dev/null
@@ -1 +0,0 @@
-Fixes: #5774 Fixed two bugs in decompression sorted merge code 
diff --git a/.unreleased/bugfix_5786 b/.unreleased/bugfix_5786
deleted file mode 100644
index ef4bf1b49..000000000
--- a/.unreleased/bugfix_5786
+++ /dev/null
@@ -1 +0,0 @@
-Fixes: #5786 Ensure pg_config --cppflags are passed
\ No newline at end of file
diff --git a/.unreleased/bugfix_5907 b/.unreleased/bugfix_5907
deleted file mode 100644
index 803fe2c46..000000000
--- a/.unreleased/bugfix_5907
+++ /dev/null
@@ -1 +0,0 @@
-Fixes: #5912 Fix crash in 1-step integer policy creation
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5a374440b..61939ed7e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,23 @@
 `psql` with the `-X` flag to prevent any `.psqlrc` commands from
 accidentally triggering the load of a previous DB version.**
 
+## 2.11.2 (2023-08-09)
+
+This release contains bug fixes since the 2.11.1 release.
+We recommend that you upgrade at the next available opportunity.
+
+**Features**
+* #5923 Feature flags for TimescaleDB features
+**Bugfixes**
+* #5680 Fix DISTINCT query with JOIN on multiple segmentby columns
+* #5774 Fixed two bugs in decompression sorted merge code 
+* #5786 Ensure pg_config --cppflags are passed
+* #5906 Fix quoting owners in sql scripts.
+* #5912 Fix crash in 1-step integer policy creation
+**Thanks**
+* @mrksngl for submitting a PR to fix extension upgrade scripts
+* @ericdevries for reporting an issue with DISTINCT queries using segmentby columns of compressed hypertable
+
 ## 2.11.1 (2023-06-29)
 
 This release contains bug fixes since the 2.11.0 release.
@@ -72,12 +89,10 @@ This release includes these noteworthy features:
 * #5642 Fix ALTER TABLE SET with normal tables
 * #5666 Reduce memory usage for distributed analyze
 * #5668 Fix subtransaction resource owner
-* #5680 Fix DISTINCT query with JOIN on multiple segmentby columns
 
 **Thanks**
 * @kovetskiy and @DZDomi for reporting peformance regression in Realtime Continuous Aggregates
 * @ollz272 for reporting an issue with interpolate error messages
-* @ericdevries for reporting an issue with DISTINCT queries using segmentby columns of compressed hypertable
 
 
 ## 2.10.3 (2023-04-26)
diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt
index 630dd4bfb..b01675058 100644
--- a/sql/CMakeLists.txt
+++ b/sql/CMakeLists.txt
@@ -36,7 +36,8 @@ set(MOD_FILES
     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.11.0--2.11.1.sql)
+    updates/2.11.0--2.11.1.sql
+    updates/2.11.1--2.11.2.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.1--2.11.2.sql b/sql/updates/2.11.1--2.11.2.sql
new file mode 100644
index 000000000..e69de29bb
diff --git a/version.config b/version.config
index 43821ca92..4ee2a3fe5 100644
--- a/version.config
+++ b/version.config
@@ -1,3 +1,3 @@
 version = 2.12.0-dev
-update_from_version = 2.11.1
+update_from_version = 2.11.2
 downgrade_to_version = 2.11.1