From 1319e532518ce39ab012c3e411ad3cdf8424cda6 Mon Sep 17 00:00:00 2001
From: Patrick Cloke <patrickc@matrix.org>
Date: Thu, 2 Jul 2020 11:06:35 -0400
Subject: [PATCH] 1.16.0rc2

---
 CHANGES.md            | 18 ++++++++++++++++++
 changelog.d/7696.doc  |  1 -
 changelog.d/7771.misc |  1 -
 synapse/__init__.py   |  2 +-
 4 files changed, 19 insertions(+), 3 deletions(-)
 delete mode 100644 changelog.d/7696.doc
 delete mode 100644 changelog.d/7771.misc

diff --git a/CHANGES.md b/CHANGES.md
index 2c21169bc..d63fb25cb 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,21 @@
+Synapse 1.16.0rc2 (2020-07-02)
+==============================
+
+Synapse 1.16.0rc2 includes the security fixes releases with Synapse 1.15.2.
+Please see [below](#synapse-1152-2020-07-02) for more details.
+
+Improved Documentation
+----------------------
+
+- Update postgres image in example `docker-compose.yaml` to tag `12-alpine`. ([\#7696](https://github.com/matrix-org/synapse/issues/7696))
+
+
+Internal Changes
+----------------
+
+- Add some metrics for inbound and outbound federation latencies: `synapse_federation_server_pdu_process_time` and `synapse_event_processing_lag_by_event`. ([\#7771](https://github.com/matrix-org/synapse/issues/7771))
+
+
 Synapse 1.16.0rc1 (2020-07-01)
 ==============================
 
diff --git a/changelog.d/7696.doc b/changelog.d/7696.doc
deleted file mode 100644
index d448bedc0..000000000
--- a/changelog.d/7696.doc
+++ /dev/null
@@ -1 +0,0 @@
-Update postgres image in example `docker-compose.yaml` to tag `12-alpine`.
diff --git a/changelog.d/7771.misc b/changelog.d/7771.misc
deleted file mode 100644
index 1fc29206a..000000000
--- a/changelog.d/7771.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add some metrics for inbound and outbound federation latencies: `synapse_federation_server_pdu_process_time` and `synapse_event_processing_lag_by_event`.
diff --git a/synapse/__init__.py b/synapse/__init__.py
index f5cd8271a..0ffbcae50 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -36,7 +36,7 @@ try:
 except ImportError:
     pass
 
-__version__ = "1.16.0rc1"
+__version__ = "1.16.0rc2"
 
 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