diff options
| author | Erik Johnston <erik@matrix.org> | 2020-01-09 13:25:48 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2020-01-09 13:25:48 +0000 |
| commit | d773290cb1d015f0debe5f64f4e495612cf1da60 (patch) | |
| tree | 33a7294ddad2c3fbbcbbd7b4831b6813176515dd | |
| parent | Merge pull request #6664 from matrix-org/erikj/media_admin_apis (diff) | |
| parent | Fixup changelog (diff) | |
| download | synapse-d773290cb1d015f0debe5f64f4e495612cf1da60.tar.xz | |
Merge branch 'master' into develop
| -rw-r--r-- | CHANGES.md | 10 | ||||
| -rw-r--r-- | changelog.d/6563.bugfix | 1 | ||||
| -rw-r--r-- | changelog.d/6657.bugfix | 1 | ||||
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | synapse/__init__.py | 2 |
5 files changed, 17 insertions, 5 deletions
diff --git a/CHANGES.md b/CHANGES.md index 24da66c596..bdc03e67d6 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,13 @@ +Synapse 1.8.0 (2020-01-09) +========================== + +Bugfixes +-------- + +- Fix `GET` request on `/_synapse/admin/v2/users` endpoint. Contributed by Awesome Technologies Innovationslabor GmbH. ([\#6563](https://github.com/matrix-org/synapse/issues/6563)) +- Fix incorrect signing of responses from the key server implementation. ([\#6657](https://github.com/matrix-org/synapse/issues/6657)) + + Synapse 1.8.0rc1 (2020-01-07) ============================= diff --git a/changelog.d/6563.bugfix b/changelog.d/6563.bugfix deleted file mode 100644 index 3325fb1dcf..0000000000 --- a/changelog.d/6563.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fix GET request on /_synapse/admin/v2/users endpoint. Contributed by Awesome Technologies Innovationslabor GmbH. \ No newline at end of file diff --git a/changelog.d/6657.bugfix b/changelog.d/6657.bugfix deleted file mode 100644 index 94e51a9896..0000000000 --- a/changelog.d/6657.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fix incorrect signing of responses from the key server implementation. \ No newline at end of file diff --git a/debian/changelog b/debian/changelog index 75fe89fa97..7413c238e6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,12 @@ -matrix-synapse-py3 (1.7.3ubuntu1) UNRELEASED; urgency=medium +matrix-synapse-py3 (1.8.0) stable; urgency=medium + [ Richard van der Hoff ] * Automate generation of the default log configuration file. - -- Richard van der Hoff <richard@matrix.org> Fri, 03 Jan 2020 13:55:38 +0000 + [ Synapse Packaging team ] + * New synapse release 1.8.0. + + -- Synapse Packaging team <packages@matrix.org> Thu, 09 Jan 2020 11:39:27 +0000 matrix-synapse-py3 (1.7.3) stable; urgency=medium diff --git a/synapse/__init__.py b/synapse/__init__.py index a3bd855045..0dd538d804 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -36,7 +36,7 @@ try: except ImportError: pass -__version__ = "1.8.0rc1" +__version__ = "1.8.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 |