diff options
| author | Mark Haines <mark.haines@matrix.org> | 2016-10-28 11:16:05 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2016-10-28 11:16:05 +0100 |
| commit | 82e71a259c7bb5beed351691747d34dca06da93a (patch) | |
| tree | 3ff49e1569a0b492b18a4c6df2f9930d24c120eb | |
| parent | Merge branch 'develop' into release-v0.18.2 (diff) | |
| download | synapse-82e71a259c7bb5beed351691747d34dca06da93a.tar.xz | |
Bump changelog and version
Diffstat (limited to '')
| -rw-r--r-- | CHANGES.rst | 7 | ||||
| -rw-r--r-- | synapse/__init__.py | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/CHANGES.rst b/CHANGES.rst index 61f14a2c34..0a04398c43 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,3 +1,10 @@ +Changes in synapse v0.18.2-rc5 (2016-10-28) +=========================================== + +Bug fixes: + +* Fix prometheus process metrics in worker processes (PR #1184) + Changes in synapse v0.18.2-rc4 (2016-10-27) =========================================== diff --git a/synapse/__init__.py b/synapse/__init__.py index 81c9f3c238..7ae1459562 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -16,4 +16,4 @@ """ This is a reference implementation of a Matrix home server. """ -__version__ = "0.18.2-rc4" +__version__ = "0.18.2-rc5" |