diff options
author | Neil Johnson <neil@matrix.org> | 2018-08-01 13:42:50 +0100 |
---|---|---|
committer | Neil Johnson <neil@matrix.org> | 2018-08-01 13:42:50 +0100 |
commit | 303f1c851fc363d3fc4fc4c91328abd89863341d (patch) | |
tree | e8d8c1ba55141f3eae7aa8ea74a509e3dac42e28 /changelog.d | |
parent | fix known broken test (diff) | |
parent | Merge pull request #3543 from bebehei/docker (diff) | |
download | synapse-303f1c851fc363d3fc4fc4c91328abd89863341d.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_sign_in_log_in_limits
Diffstat (limited to 'changelog.d')
-rw-r--r-- | changelog.d/3384.misc | 1 | ||||
-rw-r--r-- | changelog.d/3543.misc | 1 | ||||
-rw-r--r-- | changelog.d/3612.misc | 1 | ||||
-rw-r--r-- | changelog.d/3626.bugfix | 1 | ||||
-rw-r--r-- | changelog.d/3628.misc | 1 | ||||
-rw-r--r-- | changelog.d/3634.misc | 1 |
6 files changed, 6 insertions, 0 deletions
diff --git a/changelog.d/3384.misc b/changelog.d/3384.misc new file mode 100644 index 0000000000..5d56c876d9 --- /dev/null +++ b/changelog.d/3384.misc @@ -0,0 +1 @@ +Rewrite cache list decorator diff --git a/changelog.d/3543.misc b/changelog.d/3543.misc new file mode 100644 index 0000000000..d231d17749 --- /dev/null +++ b/changelog.d/3543.misc @@ -0,0 +1 @@ +Improve Dockerfile and docker-compose instructions diff --git a/changelog.d/3612.misc b/changelog.d/3612.misc new file mode 100644 index 0000000000..f90d2f2ff5 --- /dev/null +++ b/changelog.d/3612.misc @@ -0,0 +1 @@ +Make EventStore inherit from EventFederationStore diff --git a/changelog.d/3626.bugfix b/changelog.d/3626.bugfix new file mode 100644 index 0000000000..9a4b878986 --- /dev/null +++ b/changelog.d/3626.bugfix @@ -0,0 +1 @@ +Only import secrets when available (fix for py < 3.6) diff --git a/changelog.d/3628.misc b/changelog.d/3628.misc new file mode 100644 index 0000000000..1aebefbe18 --- /dev/null +++ b/changelog.d/3628.misc @@ -0,0 +1 @@ +Remove unused field "pdu_failures" from transactions. diff --git a/changelog.d/3634.misc b/changelog.d/3634.misc new file mode 100644 index 0000000000..2cd6af91ff --- /dev/null +++ b/changelog.d/3634.misc @@ -0,0 +1 @@ +rename replication_layer to federation_client |