summary refs log tree commit diff
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2020-01-23 13:45:23 +0000
committerBrendan Abolivier <babolivier@matrix.org>2020-01-23 13:45:23 +0000
commit51fc3f693ec70b9e2d0f8ce38873469d2cb2ff41 (patch)
treeb83036edcde8e6d89e2ff175633b61b0bd77dcc9
parenta bit of debugging for media storage providers (#6757) (diff)
parentFixup changelog (diff)
downloadsynapse-51fc3f693ec70b9e2d0f8ce38873469d2cb2ff41.tar.xz
Merge branch 'master' into develop
-rw-r--r--CHANGES.md16
-rw-r--r--changelog.d/6770.doc1
-rw-r--r--debian/changelog6
-rw-r--r--synapse/__init__.py2
4 files changed, 20 insertions, 5 deletions
diff --git a/CHANGES.md b/CHANGES.md
index 0392acbde4..8a068ae8c9 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,9 +1,19 @@
-Synapse 1.9.0rc1 (2020-01-22)
-=============================
+Synapse 1.9.0 (2020-01-23)
+==========================
 
 **WARNING**: As of this release, Synapse no longer supports versions of SQLite before 3.11, and will refuse to start when configured to use an older version. Administrators are recommended to migrate their database to Postgres (see instructions [here](docs/postgres.md)).
 
-If your Synapse deployment uses workers, note that the reverse-proxy configurations for the `synapse.app.media_repository`, `synapse.app.federation_reader` and `synapse.app.event_creator` have changed, with the addition of a few paths (see the updated configurations [here](docs/workers.md#available-worker-applications)).
+If your Synapse deployment uses workers, note that the reverse-proxy configurations for the `synapse.app.media_repository`, `synapse.app.federation_reader` and `synapse.app.event_creator` workers have changed, with the addition of a few paths (see the updated configurations [here](docs/workers.md#available-worker-applications)). Existing configurations will continue to work.
+
+
+Improved Documentation
+----------------------
+
+- Fix endpoint documentation for the List Rooms admin API. ([\#6770](https://github.com/matrix-org/synapse/issues/6770))
+
+
+Synapse 1.9.0rc1 (2020-01-22)
+=============================
 
 Features
 --------
diff --git a/changelog.d/6770.doc b/changelog.d/6770.doc
deleted file mode 100644
index a251b82238..0000000000
--- a/changelog.d/6770.doc
+++ /dev/null
@@ -1 +0,0 @@
-Fix endpoint documentation for the List Rooms admin api.
\ No newline at end of file
diff --git a/debian/changelog b/debian/changelog
index 7413c238e6..49f3187691 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+matrix-synapse-py3 (1.9.0) stable; urgency=medium
+
+  * New synapse release 1.9.0.
+
+ -- Synapse Packaging team <packages@matrix.org>  Thu, 23 Jan 2020 12:56:31 +0000
+
 matrix-synapse-py3 (1.8.0) stable; urgency=medium
 
   [ Richard van der Hoff ]
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 1c44ca0999..6236e13aa3 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -36,7 +36,7 @@ try:
 except ImportError:
     pass
 
-__version__ = "1.9.0rc1"
+__version__ = "1.9.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