summary refs log tree commit diff
path: root/changelog.d
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-02-20 14:15:56 +0000
committerRichard van der Hoff <richard@matrix.org>2019-02-20 14:15:56 +0000
commit4da63d9f6fc404b00d8c39b200f9f67c29d5dfa9 (patch)
tree43ac96a5b91bbc498228f44798cdc260de1f47c0 /changelog.d
parentApply the pusher http hack in the right place (#4692) (diff)
parentLogging improvements for the pusher (#4691) (diff)
downloadsynapse-4da63d9f6fc404b00d8c39b200f9f67c29d5dfa9.tar.xz
Merge branch 'develop' into matrix-org-hotfixes
Diffstat (limited to 'changelog.d')
-rw-r--r--changelog.d/4681.misc1
-rw-r--r--changelog.d/4688.misc1
-rw-r--r--changelog.d/4690.bugfix1
-rw-r--r--changelog.d/4691.misc1
4 files changed, 4 insertions, 0 deletions
diff --git a/changelog.d/4681.misc b/changelog.d/4681.misc
new file mode 100644

index 0000000000..37d3588804 --- /dev/null +++ b/changelog.d/4681.misc
@@ -0,0 +1 @@ +Attempt to clarify installation instructions/config diff --git a/changelog.d/4688.misc b/changelog.d/4688.misc new file mode 100644
index 0000000000..24cd2eb424 --- /dev/null +++ b/changelog.d/4688.misc
@@ -0,0 +1 @@ +Clean up gitignores diff --git a/changelog.d/4690.bugfix b/changelog.d/4690.bugfix new file mode 100644
index 0000000000..e4cfc5e413 --- /dev/null +++ b/changelog.d/4690.bugfix
@@ -0,0 +1 @@ +Fix TaskStopped exceptions in logs when outbound requests time out. \ No newline at end of file diff --git a/changelog.d/4691.misc b/changelog.d/4691.misc new file mode 100644
index 0000000000..8eb825edf0 --- /dev/null +++ b/changelog.d/4691.misc
@@ -0,0 +1 @@ +Improve the logging in the pusher process.