diff options
| author | Erik Johnston <erik@matrix.org> | 2019-07-04 11:40:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-04 11:40:28 +0100 |
| commit | f6608a8805da7f7c13473150d21d78621e55705e (patch) | |
| tree | 628a6daa12e68e14420175a569e5ca5a91246d97 | |
| parent | 1.1.0rc2 (diff) | |
| parent | Suggest people use a config file for Docker instead of env vars (diff) | |
| download | synapse-f6608a8805da7f7c13473150d21d78621e55705e.tar.xz | |
Merge pull request #5615 from matrix-org/anoa/fix_changelog_email_resets
Suggest people use a config file for Docker instead of env vars
| -rw-r--r-- | CHANGES.md | 2 | ||||
| -rw-r--r-- | changelog.d/5615.doc | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGES.md b/CHANGES.md index e4710a506c..46989f9cf7 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -5,7 +5,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/changelog.d/5615.doc b/changelog.d/5615.doc new file mode 100644 index 0000000000..0fd45c66b1 --- /dev/null +++ b/changelog.d/5615.doc @@ -0,0 +1 @@ +Change a previous changelog entry to suggest that people use a config file for Docker instead of env vars. |