From 01674479651cd12c995581911cfb58e5d5493495 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Mon, 10 Jun 2019 18:17:43 +0100
Subject: [PATCH] 1.0.0rc2
---
CHANGES.md | 11 +++++++++++
changelog.d/5392.bugfix | 1 -
changelog.d/5415.bugfix | 1 -
changelog.d/5417.bugfix | 1 -
synapse/__init__.py | 2 +-
5 files changed, 12 insertions(+), 4 deletions(-)
delete mode 100644 changelog.d/5392.bugfix
delete mode 100644 changelog.d/5415.bugfix
delete mode 100644 changelog.d/5417.bugfix
diff --git a/CHANGES.md b/CHANGES.md
index 4dea0f6319..523cdb1153 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,14 @@
+Synapse 1.0.0rc2 (2019-06-10)
+=============================
+
+Bugfixes
+--------
+
+- Remove redundant warning about key server response validation. ([\#5392](https://github.com/matrix-org/synapse/issues/5392))
+- Fix bug where old keys stored in the database with a null valid until timestamp caused all verification requests for that key to fail. ([\#5415](https://github.com/matrix-org/synapse/issues/5415))
+- Fix excessive memory using with default `federation_verify_certificates: true` configuration. ([\#5417](https://github.com/matrix-org/synapse/issues/5417))
+
+
Synapse 1.0.0rc1 (2019-06-07)
=============================
diff --git a/changelog.d/5392.bugfix b/changelog.d/5392.bugfix
deleted file mode 100644
index 295a7cfce1..0000000000
--- a/changelog.d/5392.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Remove redundant warning about key server response validation.
diff --git a/changelog.d/5415.bugfix b/changelog.d/5415.bugfix
deleted file mode 100644
index 83629e193d..0000000000
--- a/changelog.d/5415.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix bug where old keys stored in the database with a null valid until timestamp caused all verification requests for that key to fail.
diff --git a/changelog.d/5417.bugfix b/changelog.d/5417.bugfix
deleted file mode 100644
index 54be963a4e..0000000000
--- a/changelog.d/5417.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix excessive memory using with default `federation_verify_certificates: true` configuration.
\ No newline at end of file
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 77a4cfc3a5..8dc07fe73c 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -27,4 +27,4 @@ try:
except ImportError:
pass
-__version__ = "1.0.0rc1"
+__version__ = "1.0.0rc2"
--
GitLab