diff options
| author | Erik Johnston <erik@matrix.org> | 2019-07-04 14:00:27 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-07-04 14:00:27 +0100 |
| commit | 822a0f0435994d52e2f5fe25f7fa6f8d62cdbb2f (patch) | |
| tree | c59a72ef7e7a6fddeb03f123d4559ac23c706f1c | |
| parent | Move logging utilities out of the side drawer of util/ and into logging/ (#5606) (diff) | |
| parent | Update changelog (diff) | |
| download | synapse-822a0f0435994d52e2f5fe25f7fa6f8d62cdbb2f.tar.xz | |
Merge branch 'master' of github.com:matrix-org/synapse into develop
| -rw-r--r-- | CHANGES.md | 15 | ||||
| -rw-r--r-- | debian/changelog | 15 | ||||
| -rw-r--r-- | synapse/__init__.py | 2 |
3 files changed, 26 insertions, 6 deletions
diff --git a/CHANGES.md b/CHANGES.md index e4710a506c..dc8c74fe58 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,16 @@ +Synapse 1.1.0 (2019-07-04) +========================== + +As of v1.1.0, Synapse no longer supports Python 2, nor Postgres version 9.4. +See the [upgrade notes](UPGRADE.rst#upgrading-to-v110) for more details. + +This release also deprecates the use of environment variables to configure the +docker image. See the [docker README](https://github.com/matrix-org/synapse/blob/release-v1.1.0/docker/README.md#legacy-dynamic-configuration-file-support) +for more details. + +No changes since 1.1.0rc2. + + Synapse 1.1.0rc2 (2019-07-03) ============================= @@ -5,7 +18,7 @@ Bugfixes -------- - Fix regression in 1.1rc1 where OPTIONS requests to the media repo would fail. ([\#5593](https://github.com/matrix-org/synapse/issues/5593)) -- Removed the `SYNAPSE_SMTP_*` docker container environment variables. Using these environment variables prevented the docker container from starting in Synapse v1.0, even though they didn't actually allow any functionality anyway. Users are advised to remove `SYNAPSE_SMTP_HOST`, `SYNAPSE_SMTP_PORT`, `SYNAPSE_SMTP_USER`, `SYNAPSE_SMTP_PASSWORD` and `SYNAPSE_SMTP_FROM` environment variables from their docker run commands. ([\#5596](https://github.com/matrix-org/synapse/issues/5596)) +- Removed the `SYNAPSE_SMTP_*` docker container environment variables. Using these environment variables prevented the docker container from starting in Synapse v1.0, even though they didn't actually allow any functionality anyway. ([\#5596](https://github.com/matrix-org/synapse/issues/5596)) - Fix a number of "Starting txn from sentinel context" warnings. ([\#5605](https://github.com/matrix-org/synapse/issues/5605)) diff --git a/debian/changelog b/debian/changelog index bf5a59b335..b964cf90a2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,19 @@ -matrix-synapse-py3 (1.0.0+nmu1) UNRELEASED; urgency=medium +matrix-synapse-py3 (1.1.0-1) UNRELEASED; urgency=medium + + [ Amber Brown ] + * Update logging config defaults to match API changes in Synapse. + + -- Erik Johnston <erikj@rae> Thu, 04 Jul 2019 13:59:02 +0100 + +matrix-synapse-py3 (1.1.0) stable; urgency=medium [ Silke Hofstra ] * Include systemd-python to allow logging to the systemd journal. - [ Amber Brown ] - * Update logging config defaults to match API changes in Synapse. + [ Synapse Packaging team ] + * New synapse release 1.1.0. - -- Silke Hofstra <silke@slxh.eu> Wed, 29 May 2019 09:45:29 +0200 + -- Synapse Packaging team <packages@matrix.org> Thu, 04 Jul 2019 11:43:41 +0100 matrix-synapse-py3 (1.0.0) stable; urgency=medium diff --git a/synapse/__init__.py b/synapse/__init__.py index 5fe8631973..cf22fabd61 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -35,4 +35,4 @@ try: except ImportError: pass -__version__ = "1.1.0rc2" +__version__ = "1.1.0" |