aboutsummaryrefslogtreecommitdiffstats
path: root/actioncable
diff options
context:
space:
mode:
authorJon Moss <maclover7@users.noreply.github.com>2016-12-27 08:49:50 -0500
committerGitHub <noreply@github.com>2016-12-27 08:49:50 -0500
commit4d5ced349ca2b4fe756481f4b01a7a4574457889 (patch)
treed6a5f0fd618b7af98d7d1442f44f67ad4ddd14c8 /actioncable
parent57908d8a5e4ea83251b338cf51648a552969f3dd (diff)
parent0017866341e6ee085987173b0b586e8b7e8fee65 (diff)
downloadrails-4d5ced349ca2b4fe756481f4b01a7a4574457889.tar.gz
rails-4d5ced349ca2b4fe756481f4b01a7a4574457889.tar.bz2
rails-4d5ced349ca2b4fe756481f4b01a7a4574457889.zip
Merge pull request #27472 from maclover7/jm-fixup-changelogs
Small edits to CHANGELOG.md files
Diffstat (limited to 'actioncable')
-rw-r--r--actioncable/CHANGELOG.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/actioncable/CHANGELOG.md b/actioncable/CHANGELOG.md
index 2c84d3158f..4f17274a01 100644
--- a/actioncable/CHANGELOG.md
+++ b/actioncable/CHANGELOG.md
@@ -13,12 +13,12 @@
*Vladimir Dementyev*
-* Buffer now writes to websocket connections, to avoid blocking threads
+* Buffer now writes to WebSocket connections, to avoid blocking threads
that could be doing more useful things.
*Matthew Draper*, *Tinco Andringa*
-* Protect against concurrent writes to a websocket connection from
+* Protect against concurrent writes to a WebSocket connection from
multiple threads; the underlying OS write is not always threadsafe.
*Tinco Andringa*