summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2020-10-07 17:20:24 +0100
committerErik Johnston <erik@matrix.org>2020-10-07 17:20:24 +0100
commit1baa8953104c7a1482a463398706d78bb48cb1dc (patch)
treed172260840af3049883dbf102ad752dd8b8a95fa
parentMove additional tasks to the background worker (#8458) (diff)
parentReduce serialization errors in MultiWriterIdGen (#8456) (diff)
downloadsynapse-1baa8953104c7a1482a463398706d78bb48cb1dc.tar.xz
Merge remote-tracking branch 'origin/release-v1.21.0' into develop
-rw-r--r--changelog.d/8475.misc1
-rwxr-xr-xscripts-dev/build_debian_packages1
2 files changed, 2 insertions, 0 deletions
diff --git a/changelog.d/8475.misc b/changelog.d/8475.misc
new file mode 100644

index 0000000000..69bcb04097 --- /dev/null +++ b/changelog.d/8475.misc
@@ -0,0 +1 @@ +Add Groovy Gorilla to the list of distributions we build `.deb`s for. diff --git a/scripts-dev/build_debian_packages b/scripts-dev/build_debian_packages
index d055cf3287..d0685c8b35 100755 --- a/scripts-dev/build_debian_packages +++ b/scripts-dev/build_debian_packages
@@ -25,6 +25,7 @@ DISTS = ( "ubuntu:xenial", "ubuntu:bionic", "ubuntu:focal", + "ubuntu:groovy", ) DESC = '''\