From 24b2c940fb657270bfbe3d7a18c5e9363c42663d Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Thu, 9 Jan 2020 11:39:29 +0000
Subject: [PATCH] 1.8.0

---
 CHANGES.md              | 10 ++++++++++
 changelog.d/6563.bugfix |  1 -
 changelog.d/6657.bugfix |  1 -
 debian/changelog        |  8 ++++++--
 synapse/__init__.py     |  2 +-
 5 files changed, 17 insertions(+), 5 deletions(-)
 delete mode 100644 changelog.d/6563.bugfix
 delete mode 100644 changelog.d/6657.bugfix

diff --git a/CHANGES.md b/CHANGES.md
index df94f742c..e33e0d7f0 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,13 @@
+Synapse 1.8.0 (2020-01-09)
+==========================
+
+Bugfixes
+--------
+
+- Fix GET request on /_synapse/admin/v2/users endpoint. Contributed by Awesome Technologies Innovationslabor GmbH. ([\#6563](https://github.com/matrix-org/synapse/issues/6563))
+- Fix incorrect signing of responses from the key server implementation. ([\#6657](https://github.com/matrix-org/synapse/issues/6657))
+
+
 Synapse 1.8.0rc1 (2020-01-07)
 =============================
 
diff --git a/changelog.d/6563.bugfix b/changelog.d/6563.bugfix
deleted file mode 100644
index 3325fb1dc..000000000
--- a/changelog.d/6563.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix GET request on /_synapse/admin/v2/users endpoint. Contributed by Awesome Technologies Innovationslabor GmbH.
\ No newline at end of file
diff --git a/changelog.d/6657.bugfix b/changelog.d/6657.bugfix
deleted file mode 100644
index 94e51a989..000000000
--- a/changelog.d/6657.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix incorrect signing of responses from the key server implementation.
\ No newline at end of file
diff --git a/debian/changelog b/debian/changelog
index 75fe89fa9..7413c238e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
-matrix-synapse-py3 (1.7.3ubuntu1) UNRELEASED; urgency=medium
+matrix-synapse-py3 (1.8.0) stable; urgency=medium
 
+  [ Richard van der Hoff ]
   * Automate generation of the default log configuration file.
 
- -- Richard van der Hoff <richard@matrix.org>  Fri, 03 Jan 2020 13:55:38 +0000
+  [ Synapse Packaging team ]
+  * New synapse release 1.8.0.
+
+ -- Synapse Packaging team <packages@matrix.org>  Thu, 09 Jan 2020 11:39:27 +0000
 
 matrix-synapse-py3 (1.7.3) stable; urgency=medium
 
diff --git a/synapse/__init__.py b/synapse/__init__.py
index a3bd85504..0dd538d80 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -36,7 +36,7 @@ try:
 except ImportError:
     pass
 
-__version__ = "1.8.0rc1"
+__version__ = "1.8.0"
 
 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