diff options
| -rw-r--r-- | CHANGES.md | 10 | ||||
| -rw-r--r-- | changelog.d/7684.bugfix | 1 | ||||
| -rw-r--r-- | changelog.d/7685.bugfix | 1 | ||||
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | synapse/__init__.py | 2 |
5 files changed, 17 insertions, 3 deletions
diff --git a/CHANGES.md b/CHANGES.md index 4a356442e3..6abf4068fc 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,13 @@ +Synapse 1.15.1 (2020-06-16) +=========================== + +Bugfixes +-------- + +- Fix a bug introduced on v1.15.0 that would crash Synapse on start when using certain password auth providers. ([\#7684](https://github.com/matrix-org/synapse/issues/7684)) +- Fix a bug introduced on v1.15.0 which meant that some 3PID management endpoints were not accessible on the correct URL. ([\#7685](https://github.com/matrix-org/synapse/issues/7685)) + + Synapse 1.15.0 (2020-06-11) =========================== diff --git a/changelog.d/7684.bugfix b/changelog.d/7684.bugfix deleted file mode 100644 index a93a92ea8b..0000000000 --- a/changelog.d/7684.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fix a bug that would crash Synapse on start when using certain password auth providers. Broke in release v1.15.0. diff --git a/changelog.d/7685.bugfix b/changelog.d/7685.bugfix deleted file mode 100644 index ca87e570d3..0000000000 --- a/changelog.d/7685.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fix bug introduced on v1.15.0 which meant that some 3PID management endpoints were not accessible on the correct URL. \ No newline at end of file diff --git a/debian/changelog b/debian/changelog index 182a50ee37..3e83e9be9a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +matrix-synapse-py3 (1.15.1) stable; urgency=medium + + * New synapse release 1.15.1. + + -- Synapse Packaging team <packages@matrix.org> Tue, 16 Jun 2020 10:27:50 +0100 + matrix-synapse-py3 (1.15.0) stable; urgency=medium * New synapse release 1.15.0. diff --git a/synapse/__init__.py b/synapse/__init__.py index 1d9d85a727..4d39996a2e 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -36,7 +36,7 @@ try: except ImportError: pass -__version__ = "1.15.0" +__version__ = "1.15.1" 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 |