diff options
| author | Richard van der Hoff <richard@matrix.org> | 2018-09-26 13:24:07 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2018-09-26 13:24:07 +0100 |
| commit | bf01efb8647e09a17bcd7b069d9e48e38b2defc4 (patch) | |
| tree | 7acf0bf4bbd66c46952eec1da1e8e594a7a25375 /changelog.d | |
| parent | Actuall set cache factors in workers (diff) | |
| parent | Merge pull request #3956 from matrix-org/rav/fix_expiring_cache_len (diff) | |
| download | synapse-bf01efb8647e09a17bcd7b069d9e48e38b2defc4.tar.xz | |
Merge branch 'develop' into rav/hacky_cache_factor_fix
Diffstat (limited to 'changelog.d')
| -rw-r--r-- | changelog.d/3948.misc | 1 | ||||
| -rw-r--r-- | changelog.d/3956.bugfix | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/changelog.d/3948.misc b/changelog.d/3948.misc new file mode 100644 index 0000000000..a93edbd1c3 --- /dev/null +++ b/changelog.d/3948.misc @@ -0,0 +1 @@ +Fix incompatibility with python3 on alpine \ No newline at end of file diff --git a/changelog.d/3956.bugfix b/changelog.d/3956.bugfix new file mode 100644 index 0000000000..b0828c9fc6 --- /dev/null +++ b/changelog.d/3956.bugfix @@ -0,0 +1 @@ +Fix exceptions from metrics handler \ No newline at end of file |