From 74fb72921352a6aaa3736c9b45a9d0e3cdfe0d21 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Sat, 17 Aug 2019 09:16:17 +0100
Subject: [PATCH] 1.3.1
---
CHANGES.md | 15 +++++++++++++++
changelog.d/5867.bugfix | 1 -
changelog.d/5871.feature | 1 -
debian/changelog | 14 ++++++++++++--
synapse/__init__.py | 2 +-
5 files changed, 28 insertions(+), 5 deletions(-)
delete mode 100644 changelog.d/5867.bugfix
delete mode 100644 changelog.d/5871.feature
diff --git a/CHANGES.md b/CHANGES.md
index d13dcb717e..f25c7d0c1a 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,18 @@
+Synapse 1.3.1 (2019-08-17)
+==========================
+
+Features
+--------
+
+- Drop hard dependency on `sdnotify` python package. ([\#5871](https://github.com/matrix-org/synapse/issues/5871))
+
+
+Bugfixes
+--------
+
+- Fix startup issue (hang on ACME provisioning) due to ordering of Twisted reactor startup. Thanks to @chrismoos for supplying the fix. ([\#5867](https://github.com/matrix-org/synapse/issues/5867))
+
+
Synapse 1.3.0 (2019-08-15)
==========================
diff --git a/changelog.d/5867.bugfix b/changelog.d/5867.bugfix
deleted file mode 100644
index d68b152762..0000000000
--- a/changelog.d/5867.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix startup issue (hang on ACME provisioning) due to ordering of Twisted reactor startup. Thanks to @chrismoos for supplying the fix.
\ No newline at end of file
diff --git a/changelog.d/5871.feature b/changelog.d/5871.feature
deleted file mode 100644
index 8805607bf1..0000000000
--- a/changelog.d/5871.feature
+++ /dev/null
@@ -1 +0,0 @@
-Drop hard dependency on `sdnotify` python package.
\ No newline at end of file
diff --git a/debian/changelog b/debian/changelog
index 83232a0bad..76efc442d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,19 @@
+matrix-synapse-py3 (1.3.1) stable; urgency=medium
+
+ * New synapse release 1.3.1.
+
+ -- Synapse Packaging team <packages@matrix.org> Sat, 17 Aug 2019 09:15:49 +0100
+
matrix-synapse-py3 (1.3.0) stable; urgency=medium
[ Andrew Morgan ]
* Remove libsqlite3-dev from required build dependencies.
+ [ Synapse Packaging team ]
+ * New synapse release 1.3.0.
+
+ -- Synapse Packaging team <packages@matrix.org> Thu, 15 Aug 2019 12:04:23 +0100
+
matrix-synapse-py3 (1.2.0) stable; urgency=medium
[ Amber Brown ]
@@ -13,9 +24,8 @@ matrix-synapse-py3 (1.2.0) stable; urgency=medium
[ Synapse Packaging team ]
* New synapse release 1.2.0.
- * New synapse release 1.3.0.
- -- Synapse Packaging team <packages@matrix.org> Thu, 15 Aug 2019 12:04:23 +0100
+ -- Synapse Packaging team <packages@matrix.org> Thu, 25 Jul 2019 14:10:07 +0100
matrix-synapse-py3 (1.1.0) stable; urgency=medium
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 02ae90b072..6766ef445c 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -35,4 +35,4 @@ try:
except ImportError:
pass
-__version__ = "1.3.0"
+__version__ = "1.3.1"
--
GitLab