Skip to content

Commit

Permalink
Merge pull request #3576 from zowe/users/oscar/merge2.11RCchangesback…
Browse files Browse the repository at this point in the history
…tostaging

Merge 2.11 rc changes back to staging
  • Loading branch information
ojcelis authored Sep 13, 2023
2 parents 6e1f6e6 + d39d40c commit 0628690
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
2 changes: 1 addition & 1 deletion manifest.json.template
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Zowe",
"version": "2.11.0",
"version": "2.12.0",
"description": "Zowe is an open source project created to host technologies that benefit the Z platform from all members of the Z community (Integrated Software Vendors, System Integrators and z/OS consumers). Zowe, like Mac or Windows, comes with a set of APIs and OS capabilities that applications build on and also includes some applications out of the box. Zowe offers modern interfaces to interact with z/OS and allows you to work with z/OS in a way that is similar to what you experience on cloud platforms today. You can use these interfaces as delivered or through plug-ins and extensions that are created by clients or third-party vendors.",
"license": "EPL-2.0",
"homepage": "https://zowe.org",
Expand Down
9 changes: 4 additions & 5 deletions schemas/zowe-yaml-schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -789,27 +789,26 @@
"type": "object",
"additionalProperties": false,
"description": "Certificate in PEM format.",
"required": ["key", "certificate"],
"properties": {
"key": {
"$ref": "/schemas/v2/server-common#zowePath",
"type": "string",
"description": "Path to the certificate private key stored in PEM format."
},
"certificate": {
"$ref": "/schemas/v2/server-common#zowePath",
"type": "string",
"description": "Path to the certificate stored in PEM format."
},
"certificateAuthorities": {
"description": "List of paths to the certificate authorities stored in PEM format.",
"oneOf": [{
"$ref": "/schemas/v2/server-common#zowePath",
"type": "string",
"description": "Paths to the certificate authorities stored in PEM format. You can separate multiple certificate authorities by comma."
},
{
"type": "array",
"description": "Path to the certificate authority stored in PEM format.",
"items": {
"$ref": "/schemas/v2/server-common#zowePath"
"type": "string"
}
}
]
Expand Down

0 comments on commit 0628690

Please sign in to comment.