diff options
author | Neil Johnson <neil@matrix.org> | 2018-08-03 13:40:47 +0100 |
---|---|---|
committer | Neil Johnson <neil@matrix.org> | 2018-08-03 13:40:47 +0100 |
commit | 897c51d2742bead151a6306cd236b517982b8a69 (patch) | |
tree | 75f588d3949381a3d049eb5f192dba4ded09d0ec /changelog.d | |
parent | update generate_monthly_active_users, and reap_monthly_active_users (diff) | |
parent | Merge pull request #3645 from matrix-org/michaelkaye/mention_newsfragment (diff) | |
download | synapse-897c51d2742bead151a6306cd236b517982b8a69.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_tracker
Diffstat (limited to 'changelog.d')
-rw-r--r-- | changelog.d/3621.misc | 1 | ||||
-rw-r--r-- | changelog.d/3638.misc | 1 | ||||
-rw-r--r-- | changelog.d/3639.feature | 1 | ||||
-rw-r--r-- | changelog.d/3645.misc | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/changelog.d/3621.misc b/changelog.d/3621.misc new file mode 100644 index 0000000000..83e5fc8aa1 --- /dev/null +++ b/changelog.d/3621.misc @@ -0,0 +1 @@ +Refactor FederationHandler to move DB writes into separate functions diff --git a/changelog.d/3638.misc b/changelog.d/3638.misc new file mode 100644 index 0000000000..9faab15cf2 --- /dev/null +++ b/changelog.d/3638.misc @@ -0,0 +1 @@ +Factor out exception handling in federation_client diff --git a/changelog.d/3639.feature b/changelog.d/3639.feature new file mode 100644 index 0000000000..c8c387e219 --- /dev/null +++ b/changelog.d/3639.feature @@ -0,0 +1 @@ +When we fail to join a room over federation, pass the error code back to the client. \ No newline at end of file diff --git a/changelog.d/3645.misc b/changelog.d/3645.misc new file mode 100644 index 0000000000..0fe6b28da1 --- /dev/null +++ b/changelog.d/3645.misc @@ -0,0 +1 @@ +Update CONTRIBUTING to mention newsfragments. |