diff options
| author | Erik Johnston <erik@matrix.org> | 2019-05-30 16:39:49 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-05-30 16:39:49 +0100 |
| commit | 99113e40ba4c5667a60ebcbf391ba9a840693576 (patch) | |
| tree | f8376b9e7c7ee6e15049b85c39ac9e28bb4bbd75 | |
| parent | Merge pull request #5291 from matrix-org/erikj/add_index (diff) | |
| parent | 0.99.5.2 (diff) | |
| download | synapse-99113e40ba4c5667a60ebcbf391ba9a840693576.tar.xz | |
Merge branch 'master' into develop
| -rw-r--r-- | CHANGES.md | 12 | ||||
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | synapse/__init__.py | 2 |
3 files changed, 17 insertions, 3 deletions
diff --git a/CHANGES.md b/CHANGES.md index 6bdfdd6d70..0ffdf1aaef 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,8 +1,16 @@ -Synapse 0.99.5.1 (2019-05-22) +Synapse 0.99.5.2 (2019-05-30) ============================= -No significant changes. +Bugfixes +-------- + +- Fix bug where we leaked extremities when we soft failed events, leading to performance degradation. ([\#5274](https://github.com/matrix-org/synapse/issues/5274), [\#5278](https://github.com/matrix-org/synapse/issues/5278), [\#5291](https://github.com/matrix-org/synapse/issues/5291)) + + +Synapse 0.99.5.1 (2019-05-22) +============================= +0.99.5.1 supersedes 0.99.5 due to malformed debian changelog - no functional changes. Synapse 0.99.5 (2019-05-22) =========================== diff --git a/debian/changelog b/debian/changelog index 90c6b86c5b..6a1a72c0e3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +matrix-synapse-py3 (0.99.5.2) stable; urgency=medium + + * New synapse release 0.99.5.2. + + -- Synapse Packaging team <packages@matrix.org> Thu, 30 May 2019 16:28:07 +0100 + matrix-synapse-py3 (0.99.5.1) stable; urgency=medium * New synapse release 0.99.5.1. diff --git a/synapse/__init__.py b/synapse/__init__.py index 4f95778eea..d0e8d7c21b 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -27,4 +27,4 @@ try: except ImportError: pass -__version__ = "0.99.5.1" +__version__ = "0.99.5.2" |