diff options
| author | Richard van der Hoff <richard@matrix.org> | 2018-09-26 12:55:53 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2018-09-26 12:55:53 +0100 |
| commit | 5b4028fa787a00e19f1e7003807c5702a29816cd (patch) | |
| tree | f2cf93ce5ef2105c2fec21da10786d3d9ae28130 /changelog.d | |
| parent | Merge remote-tracking branch 'origin/develop' into erikj/destination_retry_cache (diff) | |
| parent | Log which cache is throwing exceptions (diff) | |
| download | synapse-5b4028fa787a00e19f1e7003807c5702a29816cd.tar.xz | |
Merge branch 'rav/fix_expiring_cache_len' into erikj/destination_retry_cache
Diffstat (limited to 'changelog.d')
| -rw-r--r-- | changelog.d/3911.misc | 1 | ||||
| -rw-r--r-- | changelog.d/3956.bugfix | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/changelog.d/3911.misc b/changelog.d/3911.misc new file mode 100644 index 0000000000..e31311d520 --- /dev/null +++ b/changelog.d/3911.misc @@ -0,0 +1 @@ +Fix the docker image building on python 3 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 |