From 366877c579436b074c78f62eb4ae7c12e8a4adeb Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Wed, 6 Mar 2019 19:04:52 +0000
Subject: [PATCH] Update changelog

---
 changelog.d/4818.bugfix | 1 +
 changelog.d/4818.misc   | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 changelog.d/4818.bugfix
 delete mode 100644 changelog.d/4818.misc

diff --git a/changelog.d/4818.bugfix b/changelog.d/4818.bugfix
new file mode 100644
index 000000000..ebbc27a43
--- /dev/null
+++ b/changelog.d/4818.bugfix
@@ -0,0 +1 @@
+Fix bug where we didn't correctly throttle sending of USER_IP commands over replication.
diff --git a/changelog.d/4818.misc b/changelog.d/4818.misc
deleted file mode 100644
index d101aca03..000000000
--- a/changelog.d/4818.misc
+++ /dev/null
@@ -1 +0,0 @@
-Prefill client IPs cache on workers.