From 36a80b41dc67ee6ad4c544a06e6f2fe23d5463e3 Mon Sep 17 00:00:00 2001
From: Chad Ingram <matrix9180@gmail.com>
Date: Sat, 21 Jan 2017 22:03:09 -0500
Subject: Add changelog entry for #27425 [ci skip]

---
 actioncable/CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'actioncable/CHANGELOG.md')

diff --git a/actioncable/CHANGELOG.md b/actioncable/CHANGELOG.md
index 4f17274a01..7657a05077 100644
--- a/actioncable/CHANGELOG.md
+++ b/actioncable/CHANGELOG.md
@@ -1,3 +1,9 @@
+*   Redis subscription adapters now support `channel_prefix` option in `cable.yml`
+
+    Avoids channel name collisions when multiple apps use the same Redis server.
+
+    *Chad Ingram*
+
 *   Permit same-origin connections by default.
 
     Added new option `config.action_cable.allow_same_origin_as_host = false`
-- 
cgit v1.2.3