Merge pull request #511 from zowe/v2.x/staging

Updated rc with latest staging for Rc3
zowe · Sep 12, 2022 · 869005d · 869005d
2 parents adc0b09 + a296805
commit 869005d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/defaults.yaml b/defaults.yaml
@@ -15,7 +15,7 @@ components:
         retryIntervalSeconds: 10
       https:
         keyring: ${{ ()=> { if (components.zss.tls) { if (zowe.certificate.keystore.type == "JCERACFKS") { return zowe.certificate.keystore.file.substring(15) } else { return zowe.certificate.keystore.file } } else { return null } }() }}
-        password: ${{ ()=> { if (components.zss.tls) { return zowe.certificate.keystore.password } else { null } }() }}
+        password: ${{ ()=> { if (components.zss.tls) { if (zowe.certificate.keystore.type == "JCERACFKS") { return null } else { return zowe.certificate.keystore.password } } else { return null } }() }}
         label: ${{ ()=> { if (components.zss.tls) { return zowe.certificate.keystore.alias } else { return null } }() }}
         port: ${{ ()=> { if (components.zss.tls) { return  components.zss.port } else { return null } }() }}
         ipAddresses: ${{ ()=> { if (components.zss.tls){ if (zowe.environments?.ZWED_agent_https_ipAddresses){ return zowe.environments.ZWED_agent_https_ipAddresses.split(',') } else { return [ '0.0.0.0' ] } } else { return null } }() }}
@@ -36,4 +36,4 @@ components:
         serviceName: "zss"
       handshakeTimeout: 30000
 
-
+
diff --git a/deps/zowe-common-c b/deps/zowe-common-c
+1 −1		.github/workflows/build-configmgr.yml
+2 −2		.github/workflows/build-rexxconfigmgr.yml
+4 −4		c/jsonschema.c