1 files changed, 37 insertions, 3 deletions
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md
index 047688aba8..30985060fd 100644
--- a/activesupport/CHANGELOG.md
+++ b/activesupport/CHANGELOG.md
@@ -1,3 +1,37 @@
+*   Remove unused parameter `options = nil` for `#clear` of
+    `ActiveSupport::Cache::Strategy::LocalCache::LocalStore` and
+    `ActiveSupport::Cache::Strategy::LocalCache`.
+
+    *Yosuke Kabuto*
+
+*   Fix `thread_mattr_accessor` subclass no longer overwrites parent.
+
+    Assigning a value to a subclass using `thread_mattr_accessor` no
+    longer changes the value of the parent class. This brings the
+    behavior inline with the documentation.
+
+    Given:
+
+        class Account
+          thread_mattr_accessor :user
+        end
+
+        class Customer < Account
+        end
+
+        Account.user = "DHH"
+        Customer.user = "Rafael"
+
+    Before:
+
+        Account.user  # => "Rafael"
+
+    After:
+
+        Account.user  # => "DHH"
+
+    *Shinichi Maeshima*
+
 *   Since weeks are no longer converted to days, add `:weeks` to the list of
     parts that `ActiveSupport::TimeWithZone` will recognize as possibly being
     of variable duration to take account of DST transitions.
@@ -12,10 +46,10 @@
 
     *Xavier Noria*
 
-*   Allow MessageEncryptor to take advantage of authenticated encryption modes.
+*   Allow `MessageEncryptor` to take advantage of authenticated encryption modes.
 
     AEAD modes like `aes-256-gcm` provide both confidentiality and data
-    authenticity, eliminating the need to use MessageVerifier to check if the
+    authenticity, eliminating the need to use `MessageVerifier` to check if the
     encrypted data has been tampered with. This speeds up encryption/decryption
     and results in shorter cipher text.
 
@@ -119,7 +153,7 @@
 
     *Sean Griffin*
 
-*   Introduce Module#delegate_missing_to.
+*   Introduce `Module#delegate_missing_to`.
 
     When building a decorator, a common pattern emerges: