From 29794c6bc84b9ba76f041bbc8a180b7421996004 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Fri, 20 Dec 2019 10:58:07 +0000
Subject: [PATCH] 1.7.2

---
 CHANGES.md              | 12 ++++++++++++
 changelog.d/6576.bugfix |  1 -
 changelog.d/6578.bugfix |  1 -
 debian/changelog        |  6 ++++++
 synapse/__init__.py     |  2 +-
 5 files changed, 19 insertions(+), 3 deletions(-)
 delete mode 100644 changelog.d/6576.bugfix
 delete mode 100644 changelog.d/6578.bugfix

diff --git a/CHANGES.md b/CHANGES.md
index 7927714a3..d6567e24d 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,15 @@
+Synapse 1.7.2 (2019-12-20)
+==========================
+
+This release fixes some regressions introduced in Synapse 1.7.0 and 1.7.1.
+
+Bugfixes
+--------
+
+- Fix a regression introduced in Synapse 1.7.1 which caused errors when attempting to backfill rooms over federation. ([\#6576](https://github.com/matrix-org/synapse/issues/6576))
+- Fix a bug introduced in Synapse 1.7.0 which caused an error on startup when upgrading from versions before 1.3.0. ([\#6578](https://github.com/matrix-org/synapse/issues/6578))
+
+
 Synapse 1.7.1 (2019-12-18)
 ==========================
 
diff --git a/changelog.d/6576.bugfix b/changelog.d/6576.bugfix
deleted file mode 100644
index f5414fce4..000000000
--- a/changelog.d/6576.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix errors when attempting to backfill rooms over federation.
diff --git a/changelog.d/6578.bugfix b/changelog.d/6578.bugfix
deleted file mode 100644
index fae55a445..000000000
--- a/changelog.d/6578.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a bug introduced in Synapse 1.7.0 which caused an error on startup when upgrading from versions before 1.3.0.
diff --git a/debian/changelog b/debian/changelog
index e400619eb..2492b5db9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+matrix-synapse-py3 (1.7.2) stable; urgency=medium
+
+  * New synapse release 1.7.2.
+
+ -- Synapse Packaging team <packages@matrix.org>  Fri, 20 Dec 2019 10:56:50 +0000
+
 matrix-synapse-py3 (1.7.1) stable; urgency=medium
 
   * New synapse release 1.7.1.
diff --git a/synapse/__init__.py b/synapse/__init__.py
index e951bab59..996101cf0 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -36,7 +36,7 @@ try:
 except ImportError:
     pass
 
-__version__ = "1.7.1"
+__version__ = "1.7.2"
 
 if bool(os.environ.get("SYNAPSE_TEST_PATCH_LOG_CONTEXTS", False)):
     # We import here so that we don't have to install a bunch of deps when