From 967f99b9f810522144e053be8086a1f4cc38b8ce Mon Sep 17 00:00:00 2001
From: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
Date: Thu, 9 Apr 2020 12:44:48 +0100
Subject: Unblacklist /upgrade creates a new room (#7228)

This commit was originally merged in #7228 but reverted in #7254 as the
associated sytest was not ready yet. Now that it is, we can merge this
again.
---
 .buildkite/worker-blacklist | 2 --
 changelog.d/7228.misc       | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)
 create mode 100644 changelog.d/7228.misc

diff --git a/.buildkite/worker-blacklist b/.buildkite/worker-blacklist
index 094b6c94da..fd98cbbaf6 100644
--- a/.buildkite/worker-blacklist
+++ b/.buildkite/worker-blacklist
@@ -5,8 +5,6 @@ Message history can be paginated
 
 Can re-join room if re-invited
 
-/upgrade creates a new room
-
 The only membership state included in an initial sync is for all the senders in the timeline
 
 Local device key changes get to remote servers
diff --git a/changelog.d/7228.misc b/changelog.d/7228.misc
new file mode 100644
index 0000000000..50e206377f
--- /dev/null
+++ b/changelog.d/7228.misc
@@ -0,0 +1 @@
+Unblacklist '/upgrade creates a new room' sytest for workers.
\ No newline at end of file
-- 
cgit 1.4.1