update changelog

haraka · Apr 22, 2024 · b11fd3b · b11fd3b
1 parent 32300b1
commit b11fd3b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/).
 ### [2.0.7] - 2024-04-21
 
 - populate [files] in package.json. Delete .npmignore.
+- lint: remove duplicate / stale rules from .eslintrc
+- ci: update to shared GHA workflows
+- doc(CONTRIBUTORS): added
+- doc: Changes -> CHANGELOG
+- prettier
 
 ### [2.0.6] - 2023-12-12
 

diff --git a/index.js b/index.js
@@ -45,18 +45,10 @@ exports.load_redis_ini = function () {
     delete plugin.redisCfg.db
   }
 
-  plugin.redisCfg.server = Object.assign(
-    {},
-    defaultOpts,
-    plugin.redisCfg.opts,
-    plugin.redisCfg.server,
-  )
-  plugin.redisCfg.pubsub = Object.assign(
-    {},
-    defaultOpts,
-    plugin.redisCfg.opts,
-    plugin.redisCfg.pubsub,
-  )
+  plugin.redisCfg.server = 
+    { ...defaultOpts, ...plugin.redisCfg.opts, ...plugin.redisCfg.server };
+  plugin.redisCfg.pubsub = 
+    { ...defaultOpts, ...plugin.redisCfg.opts, ...plugin.redisCfg.pubsub };
 
   // socket options. In redis < 4, the options like host and port were
   // top level, now they're in socket.*. Permit legacy configs to still work