From 20332b278da3128421334e7cbf806a0c06f31e23 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Thu, 4 Jul 2019 11:44:09 +0100
Subject: [PATCH] 1.1.0
---
CHANGES.md | 3 +++
changelog.d/5615.doc | 1 -
debian/changelog | 7 +++++--
synapse/__init__.py | 2 +-
4 files changed, 9 insertions(+), 4 deletions(-)
delete mode 100644 changelog.d/5615.doc
diff --git a/CHANGES.md b/CHANGES.md
index 46989f9cf7..a528251dec 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,6 @@
+Synapse 1.1.0 (2019-07-04)
+==========================
+
Synapse 1.1.0rc2 (2019-07-03)
=============================
diff --git a/changelog.d/5615.doc b/changelog.d/5615.doc
deleted file mode 100644
index 0fd45c66b1..0000000000
--- a/changelog.d/5615.doc
+++ /dev/null
@@ -1 +0,0 @@
-Change a previous changelog entry to suggest that people use a config file for Docker instead of env vars.
diff --git a/debian/changelog b/debian/changelog
index 91653e7243..cf39bed907 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,12 @@
-matrix-synapse-py3 (1.0.0+nmu1) UNRELEASED; urgency=medium
+matrix-synapse-py3 (1.1.0) stable; urgency=medium
[ Silke Hofstra ]
* Include systemd-python to allow logging to the systemd journal.
- -- Silke Hofstra <silke@slxh.eu> Wed, 29 May 2019 09:45:29 +0200
+ [ Synapse Packaging team ]
+ * New synapse release 1.1.0.
+
+ -- Synapse Packaging team <packages@matrix.org> Thu, 04 Jul 2019 11:43:41 +0100
matrix-synapse-py3 (1.0.0) stable; urgency=medium
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 5fe8631973..cf22fabd61 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -35,4 +35,4 @@ try:
except ImportError:
pass
-__version__ = "1.1.0rc2"
+__version__ = "1.1.0"
--
GitLab