Merge branch 'bugfix/fix-766' of https://github.com/1000TurquoisePogs…

…/zlux-server-framework into rc
zowe · Feb 14, 2022 · a06650a · a06650a
2 parents ef4e026 + 215163d
commit a06650a
Show file tree

Hide file tree

Showing 3 changed files with 106 additions and 77 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,7 @@ This repo is part of the app-server Zowe Component, and the change logs here may
 ## 1.27.0
 
 - Bugfix: Added small check on agent network configuration to avoid throwing an exception if the agent configuration included JWT information, but not network information
+- Bugfix: keyring_js did not worked properly for finding CAs due to using an older version in package.json than needed for the listKeyring function
 
 ## 1.25.0
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -77,6 +77,6 @@
     "typescript": "2.7.1"
   },
   "optionalDependencies": {
-    "keyring_js": "~1.0.0"
+    "keyring_js": "~1.1.0"
   }
 }