summary refs log tree commit diff
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-11-06 13:51:11 +0000
committerRichard van der Hoff <richard@matrix.org>2019-11-06 13:51:11 +0000
commit915903eadaeea1944ed42c79636dd94d4aa98f64 (patch)
tree986626d7f935d4acbbccf873ac870f3887354e42
parentFix bug which caused rejected events to be stored with the wrong room state ... (diff)
parentMerge branch 'release-v1.5.1' (diff)
downloadsynapse-915903eadaeea1944ed42c79636dd94d4aa98f64.tar.xz
Merge branch 'master' into develop
-rw-r--r--CHANGES.md9
-rw-r--r--changelog.d/6331.feature1
-rw-r--r--changelog.d/6334.feature1
-rw-r--r--debian/changelog6
-rwxr-xr-xscripts-dev/build_debian_packages2
-rw-r--r--synapse/__init__.py2
6 files changed, 18 insertions, 3 deletions
diff --git a/CHANGES.md b/CHANGES.md
index 6faa4b8dce..9312dc2941 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,12 @@
+Synapse 1.5.1 (2019-11-06)
+==========================
+
+Features
+--------
+
+- Limit the length of data returned by url previews, to prevent DoS attacks. ([\#6331](https://github.com/matrix-org/synapse/issues/6331), [\#6334](https://github.com/matrix-org/synapse/issues/6334))
+
+
 Synapse 1.5.0 (2019-10-29)
 ==========================
 
diff --git a/changelog.d/6331.feature b/changelog.d/6331.feature
deleted file mode 100644
index eaf69ef3f6..0000000000
--- a/changelog.d/6331.feature
+++ /dev/null
@@ -1 +0,0 @@
-Limit the length of data returned by url previews, to prevent DoS attacks.
diff --git a/changelog.d/6334.feature b/changelog.d/6334.feature
deleted file mode 100644
index eaf69ef3f6..0000000000
--- a/changelog.d/6334.feature
+++ /dev/null
@@ -1 +0,0 @@
-Limit the length of data returned by url previews, to prevent DoS attacks.
diff --git a/debian/changelog b/debian/changelog
index acda7e5c63..c4415f460a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+matrix-synapse-py3 (1.5.1) stable; urgency=medium
+
+  * New synapse release 1.5.1.
+
+ -- Synapse Packaging team <packages@matrix.org>  Wed, 06 Nov 2019 10:02:14 +0000
+
 matrix-synapse-py3 (1.5.0) stable; urgency=medium
 
   * New synapse release 1.5.0.
diff --git a/scripts-dev/build_debian_packages b/scripts-dev/build_debian_packages
index 93305ee9b1..84eaec6a95 100755
--- a/scripts-dev/build_debian_packages
+++ b/scripts-dev/build_debian_packages
@@ -20,11 +20,13 @@ from concurrent.futures import ThreadPoolExecutor
 DISTS = (
     "debian:stretch",
     "debian:buster",
+    "debian:bullseye",
     "debian:sid",
     "ubuntu:xenial",
     "ubuntu:bionic",
     "ubuntu:cosmic",
     "ubuntu:disco",
+    "ubuntu:eoan",
 )
 
 DESC = '''\
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 8587ffa76f..ec16f54a49 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -36,7 +36,7 @@ try:
 except ImportError:
     pass
 
-__version__ = "1.5.0"
+__version__ = "1.5.1"
 
 if bool(os.environ.get("SYNAPSE_TEST_PATCH_LOG_CONTEXTS", False)):
     # We import here so that we don't have to install a bunch of deps when