From fdb816713aacb295fe804290f5043bdac866dcf5 Mon Sep 17 00:00:00 2001
From: Brendan Abolivier <babolivier@matrix.org>
Date: Wed, 12 Feb 2020 12:19:19 +0000
Subject: [PATCH] 1.10.0
---
CHANGES.md | 9 +++++++++
changelog.d/6897.docker | 1 -
debian/changelog | 6 ++++++
synapse/__init__.py | 2 +-
4 files changed, 16 insertions(+), 2 deletions(-)
delete mode 100644 changelog.d/6897.docker
diff --git a/CHANGES.md b/CHANGES.md
index 1995a70b19..603a50054e 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,12 @@
+Synapse 1.10.0 (2020-02-12)
+===========================
+
+Updates to the Docker image
+---------------------------
+
+- Update the docker images to Alpine Linux 3.11. ([\#6897](https://github.com/matrix-org/synapse/issues/6897))
+
+
Synapse 1.10.0rc5 (2020-02-11)
==============================
diff --git a/changelog.d/6897.docker b/changelog.d/6897.docker
deleted file mode 100644
index 8e7bcd719a..0000000000
--- a/changelog.d/6897.docker
+++ /dev/null
@@ -1 +0,0 @@
-Update the docker images to Alpine Linux 3.11.
diff --git a/debian/changelog b/debian/changelog
index 74eb29c5ee..cdc3b1a5c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+matrix-synapse-py3 (1.10.0) stable; urgency=medium
+
+ * New synapse release 1.10.0.
+
+ -- Synapse Packaging team <packages@matrix.org> Wed, 12 Feb 2020 12:18:54 +0000
+
matrix-synapse-py3 (1.9.1) stable; urgency=medium
* New synapse release 1.9.1.
diff --git a/synapse/__init__.py b/synapse/__init__.py
index ba339004ba..9d285fca38 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -36,7 +36,7 @@ try:
except ImportError:
pass
-__version__ = "1.10.0rc5"
+__version__ = "1.10.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
--
GitLab