From b11fd3b00c635e76e59a5bf50f9242220e29419e Mon Sep 17 00:00:00 2001
From: Matt Simerson <matt@tnpi.net>
Date: Sun, 21 Apr 2024 23:41:16 -0700
Subject: [PATCH] update changelog

---
 CHANGELOG.md |  5 +++++
 index.js     | 16 ++++------------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index eca62c8..4ed4ab6 100644
--- 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
index e7f2146..8021aa8 100644
--- 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