summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--CHANGES.md11
-rw-r--r--changelog.d/6497.bugfix1
-rw-r--r--changelog.d/6499.bugfix1
-rw-r--r--changelog.d/6507.bugfix1
-rw-r--r--changelog.d/6509.bugfix1
-rw-r--r--synapse/__init__.py2
6 files changed, 12 insertions, 5 deletions
diff --git a/CHANGES.md b/CHANGES.md
index c30ea4718d..c83a6afbcd 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,14 @@
+Synapse 1.7.0rc2 (2019-12-11)
+=============================
+
+Bugfixes
+--------
+
+- Fix incorrect error message for invalid requests when setting user's avatar URL. ([\#6497](https://github.com/matrix-org/synapse/issues/6497))
+- Fix support for SQLite 3.7. ([\#6499](https://github.com/matrix-org/synapse/issues/6499))
+- Fix regression where sending email push would not work when using a pusher worker. ([\#6507](https://github.com/matrix-org/synapse/issues/6507), [\#6509](https://github.com/matrix-org/synapse/issues/6509))
+
+
 Synapse 1.7.0rc1 (2019-12-09)
 =============================
 
diff --git a/changelog.d/6497.bugfix b/changelog.d/6497.bugfix
deleted file mode 100644
index 6a2644d8e6..0000000000
--- a/changelog.d/6497.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix incorrect error message for invalid requests when setting user's avatar URL.
diff --git a/changelog.d/6499.bugfix b/changelog.d/6499.bugfix
deleted file mode 100644
index 299feba0f8..0000000000
--- a/changelog.d/6499.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix support for SQLite 3.7.
diff --git a/changelog.d/6507.bugfix b/changelog.d/6507.bugfix
deleted file mode 100644
index d767a6237f..0000000000
--- a/changelog.d/6507.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix regression where sending email push would not work when using a pusher worker.
diff --git a/changelog.d/6509.bugfix b/changelog.d/6509.bugfix
deleted file mode 100644
index d767a6237f..0000000000
--- a/changelog.d/6509.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix regression where sending email push would not work when using a pusher worker.
diff --git a/synapse/__init__.py b/synapse/__init__.py
index c67a51a8d5..fc2a6e4ee6 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -36,7 +36,7 @@ try:
 except ImportError:
     pass
 
-__version__ = "1.7.0rc1"
+__version__ = "1.7.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